From 1eaa7117278b6ea8c1a43d7b5d185d590c6e365f Mon Sep 17 00:00:00 2001 From: Adrien GIVRY Date: Tue, 7 Jan 2020 19:02:50 -0500 Subject: [PATCH 01/46] Licence update to MIT --- Sources/Overload/OvAnalytics/include/OvAnalytics/API/Export.h | 2 +- .../Overload/OvAnalytics/include/OvAnalytics/Hardware/CPUInfo.h | 2 +- .../Overload/OvAnalytics/include/OvAnalytics/Hardware/GPUInfo.h | 2 +- .../OvAnalytics/include/OvAnalytics/Hardware/HardwareInfo.h | 2 +- .../OvAnalytics/include/OvAnalytics/Hardware/HardwareReport.h | 2 +- .../Overload/OvAnalytics/include/OvAnalytics/Hardware/RAMInfo.h | 2 +- .../OvAnalytics/include/OvAnalytics/Profiling/Profiler.h | 2 +- .../OvAnalytics/include/OvAnalytics/Profiling/ProfilerReport.h | 2 +- .../OvAnalytics/include/OvAnalytics/Profiling/ProfilerSpy.h | 2 +- .../Overload/OvAnalytics/src/OvAnalytics/Hardware/CPUInfo.cpp | 2 +- .../Overload/OvAnalytics/src/OvAnalytics/Hardware/GPUInfo.cpp | 2 +- .../OvAnalytics/src/OvAnalytics/Hardware/HardwareInfo.cpp | 2 +- .../Overload/OvAnalytics/src/OvAnalytics/Hardware/RAMInfo.cpp | 2 +- .../Overload/OvAnalytics/src/OvAnalytics/Profiling/Profiler.cpp | 2 +- .../OvAnalytics/src/OvAnalytics/Profiling/ProfilerSpy.cpp | 2 +- Sources/Overload/OvAudio/include/OvAudio/API/Export.h | 2 +- Sources/Overload/OvAudio/include/OvAudio/Core/AudioEngine.h | 2 +- Sources/Overload/OvAudio/include/OvAudio/Core/AudioPlayer.h | 2 +- .../Overload/OvAudio/include/OvAudio/Entities/AudioListener.h | 2 +- Sources/Overload/OvAudio/include/OvAudio/Entities/AudioSource.h | 2 +- .../OvAudio/include/OvAudio/Resources/Loaders/SoundLoader.h | 2 +- Sources/Overload/OvAudio/include/OvAudio/Resources/Sound.h | 2 +- .../OvAudio/include/OvAudio/Tracking/SoundStopEventBinder.h | 2 +- .../Overload/OvAudio/include/OvAudio/Tracking/SoundTracker.h | 2 +- Sources/Overload/OvAudio/src/OvAudio/Core/AudioEngine.cpp | 2 +- Sources/Overload/OvAudio/src/OvAudio/Core/AudioPlayer.cpp | 2 +- Sources/Overload/OvAudio/src/OvAudio/Entities/AudioListener.cpp | 2 +- Sources/Overload/OvAudio/src/OvAudio/Entities/AudioSource.cpp | 2 +- .../OvAudio/src/OvAudio/Resources/Loaders/SoundLoader.cpp | 2 +- Sources/Overload/OvAudio/src/OvAudio/Resources/Sound.cpp | 2 +- .../OvAudio/src/OvAudio/Tracking/SoundStopEventBinder.cpp | 2 +- Sources/Overload/OvAudio/src/OvAudio/Tracking/SoundTracker.cpp | 2 +- Sources/Overload/OvCore/include/OvCore/API/Export.h | 2 +- Sources/Overload/OvCore/include/OvCore/API/IInspectorItem.h | 2 +- Sources/Overload/OvCore/include/OvCore/API/ISerializable.h | 2 +- Sources/Overload/OvCore/include/OvCore/ECS/Actor.h | 2 +- Sources/Overload/OvCore/include/OvCore/ECS/Actor.inl | 2 +- .../Overload/OvCore/include/OvCore/ECS/Components/AComponent.h | 2 +- .../Overload/OvCore/include/OvCore/ECS/Components/Behaviour.h | 2 +- .../Overload/OvCore/include/OvCore/ECS/Components/Behaviour.inl | 2 +- .../OvCore/include/OvCore/ECS/Components/CAmbientBoxLight.h | 2 +- .../OvCore/include/OvCore/ECS/Components/CAmbientSphereLight.h | 2 +- .../OvCore/include/OvCore/ECS/Components/CAudioListener.h | 2 +- .../OvCore/include/OvCore/ECS/Components/CAudioSource.h | 2 +- Sources/Overload/OvCore/include/OvCore/ECS/Components/CCamera.h | 2 +- .../OvCore/include/OvCore/ECS/Components/CDirectionalLight.h | 2 +- Sources/Overload/OvCore/include/OvCore/ECS/Components/CLight.h | 2 +- .../OvCore/include/OvCore/ECS/Components/CMaterialRenderer.h | 2 +- .../OvCore/include/OvCore/ECS/Components/CModelRenderer.h | 2 +- .../OvCore/include/OvCore/ECS/Components/CPhysicalBox.h | 2 +- .../OvCore/include/OvCore/ECS/Components/CPhysicalCapsule.h | 2 +- .../OvCore/include/OvCore/ECS/Components/CPhysicalObject.h | 2 +- .../OvCore/include/OvCore/ECS/Components/CPhysicalSphere.h | 2 +- .../Overload/OvCore/include/OvCore/ECS/Components/CPointLight.h | 2 +- .../Overload/OvCore/include/OvCore/ECS/Components/CSpotLight.h | 2 +- .../Overload/OvCore/include/OvCore/ECS/Components/CTransform.h | 2 +- Sources/Overload/OvCore/include/OvCore/ECS/PhysicsWrapper.h | 2 +- Sources/Overload/OvCore/include/OvCore/ECS/Renderer.h | 2 +- Sources/Overload/OvCore/include/OvCore/Global/ServiceLocator.h | 2 +- Sources/Overload/OvCore/include/OvCore/Helpers/GUIDrawer.h | 2 +- Sources/Overload/OvCore/include/OvCore/Helpers/GUIDrawer.inl | 2 +- Sources/Overload/OvCore/include/OvCore/Helpers/Serializer.h | 2 +- .../OvCore/include/OvCore/ResourceManagement/AResourceManager.h | 2 +- .../include/OvCore/ResourceManagement/AResourceManager.inl | 2 +- .../OvCore/include/OvCore/ResourceManagement/MaterialManager.h | 2 +- .../OvCore/include/OvCore/ResourceManagement/ModelManager.h | 2 +- .../OvCore/include/OvCore/ResourceManagement/ShaderManager.h | 2 +- .../OvCore/include/OvCore/ResourceManagement/SoundManager.h | 2 +- .../OvCore/include/OvCore/ResourceManagement/TextureManager.h | 2 +- .../OvCore/include/OvCore/Resources/Loaders/MaterialLoader.h | 2 +- Sources/Overload/OvCore/include/OvCore/Resources/Material.h | 2 +- Sources/Overload/OvCore/include/OvCore/Resources/Material.inl | 2 +- Sources/Overload/OvCore/include/OvCore/SceneSystem/Scene.h | 2 +- .../Overload/OvCore/include/OvCore/SceneSystem/SceneManager.h | 2 +- .../Overload/OvCore/include/OvCore/Scripting/LuaActorBinder.h | 2 +- Sources/Overload/OvCore/include/OvCore/Scripting/LuaBinder.h | 2 +- .../OvCore/include/OvCore/Scripting/LuaComponentBinder.h | 2 +- .../Overload/OvCore/include/OvCore/Scripting/LuaGlobalsBinder.h | 2 +- .../Overload/OvCore/include/OvCore/Scripting/LuaMathsBinder.h | 2 +- .../OvCore/include/OvCore/Scripting/ScriptInterpreter.h | 2 +- Sources/Overload/OvCore/src/OvCore/ECS/Actor.cpp | 2 +- .../Overload/OvCore/src/OvCore/ECS/Components/AComponent.cpp | 2 +- Sources/Overload/OvCore/src/OvCore/ECS/Components/Behaviour.cpp | 2 +- .../OvCore/src/OvCore/ECS/Components/CAmbientBoxLight.cpp | 2 +- .../OvCore/src/OvCore/ECS/Components/CAmbientSphereLight.cpp | 2 +- .../OvCore/src/OvCore/ECS/Components/CAudioListener.cpp | 2 +- .../Overload/OvCore/src/OvCore/ECS/Components/CAudioSource.cpp | 2 +- Sources/Overload/OvCore/src/OvCore/ECS/Components/CCamera.cpp | 2 +- .../OvCore/src/OvCore/ECS/Components/CDirectionalLight.cpp | 2 +- Sources/Overload/OvCore/src/OvCore/ECS/Components/CLight.cpp | 2 +- .../OvCore/src/OvCore/ECS/Components/CMaterialRenderer.cpp | 2 +- .../OvCore/src/OvCore/ECS/Components/CModelRenderer.cpp | 2 +- .../Overload/OvCore/src/OvCore/ECS/Components/CPhysicalBox.cpp | 2 +- .../OvCore/src/OvCore/ECS/Components/CPhysicalCapsule.cpp | 2 +- .../OvCore/src/OvCore/ECS/Components/CPhysicalObject.cpp | 2 +- .../OvCore/src/OvCore/ECS/Components/CPhysicalSphere.cpp | 2 +- .../Overload/OvCore/src/OvCore/ECS/Components/CPointLight.cpp | 2 +- .../Overload/OvCore/src/OvCore/ECS/Components/CSpotLight.cpp | 2 +- .../Overload/OvCore/src/OvCore/ECS/Components/CTransform.cpp | 2 +- Sources/Overload/OvCore/src/OvCore/ECS/PhysicsWrapper.cpp | 2 +- Sources/Overload/OvCore/src/OvCore/ECS/Renderer.cpp | 2 +- Sources/Overload/OvCore/src/OvCore/Global/ServiceLocator.cpp | 2 +- Sources/Overload/OvCore/src/OvCore/Helpers/GUIDrawer.cpp | 2 +- Sources/Overload/OvCore/src/OvCore/Helpers/Serializer.cpp | 2 +- .../OvCore/src/OvCore/ResourceManagement/MaterialManager.cpp | 2 +- .../OvCore/src/OvCore/ResourceManagement/ModelManager.cpp | 2 +- .../OvCore/src/OvCore/ResourceManagement/ShaderManager.cpp | 2 +- .../OvCore/src/OvCore/ResourceManagement/SoundManager.cpp | 2 +- .../OvCore/src/OvCore/ResourceManagement/TextureManager.cpp | 2 +- .../OvCore/src/OvCore/Resources/Loaders/MaterialLoader.cpp | 2 +- Sources/Overload/OvCore/src/OvCore/Resources/Material.cpp | 2 +- Sources/Overload/OvCore/src/OvCore/SceneSystem/Scene.cpp | 2 +- Sources/Overload/OvCore/src/OvCore/SceneSystem/SceneManager.cpp | 2 +- Sources/Overload/OvCore/src/OvCore/Scripting/LuaActorBinder.cpp | 2 +- Sources/Overload/OvCore/src/OvCore/Scripting/LuaBinder.cpp | 2 +- .../Overload/OvCore/src/OvCore/Scripting/LuaComponentBinder.cpp | 2 +- .../Overload/OvCore/src/OvCore/Scripting/LuaGlobalsBinder.cpp | 2 +- Sources/Overload/OvCore/src/OvCore/Scripting/LuaMathsBinder.cpp | 2 +- .../Overload/OvCore/src/OvCore/Scripting/ScriptInterpreter.cpp | 2 +- Sources/Overload/OvDebug/include/OvDebug/API/Export.h | 2 +- Sources/Overload/OvDebug/include/OvDebug/Utils/Assertion.h | 2 +- Sources/Overload/OvDebug/include/OvDebug/Utils/ConsoleColor.h | 2 +- Sources/Overload/OvDebug/include/OvDebug/Utils/ConsoleHandler.h | 2 +- Sources/Overload/OvDebug/include/OvDebug/Utils/FileHandler.h | 2 +- Sources/Overload/OvDebug/include/OvDebug/Utils/HistoryHandler.h | 2 +- Sources/Overload/OvDebug/include/OvDebug/Utils/ILogHandler.h | 2 +- Sources/Overload/OvDebug/include/OvDebug/Utils/Logger.h | 2 +- Sources/Overload/OvDebug/include/OvDebug/Utils/Logger.inl | 2 +- Sources/Overload/OvDebug/src/OvDebug/Utils/Assertion.cpp | 2 +- Sources/Overload/OvDebug/src/OvDebug/Utils/ConsoleHandler.cpp | 2 +- Sources/Overload/OvDebug/src/OvDebug/Utils/FileHandler.cpp | 2 +- Sources/Overload/OvDebug/src/OvDebug/Utils/HistoryHandler.cpp | 2 +- Sources/Overload/OvDebug/src/OvDebug/Utils/Logger.cpp | 2 +- Sources/Overload/OvEditor/include/OvEditor/Core/Application.h | 2 +- .../Overload/OvEditor/include/OvEditor/Core/CameraController.h | 2 +- Sources/Overload/OvEditor/include/OvEditor/Core/Context.h | 2 +- Sources/Overload/OvEditor/include/OvEditor/Core/Editor.h | 2 +- Sources/Overload/OvEditor/include/OvEditor/Core/EditorActions.h | 2 +- .../Overload/OvEditor/include/OvEditor/Core/EditorActions.inl | 2 +- .../Overload/OvEditor/include/OvEditor/Core/EditorRenderer.h | 2 +- .../Overload/OvEditor/include/OvEditor/Core/EditorResources.h | 2 +- .../Overload/OvEditor/include/OvEditor/Core/GizmoBehaviour.h | 2 +- Sources/Overload/OvEditor/include/OvEditor/Core/PanelsManager.h | 2 +- Sources/Overload/OvEditor/include/OvEditor/Core/ProjectHub.h | 2 +- Sources/Overload/OvEditor/include/OvEditor/Panels/AView.h | 2 +- .../OvEditor/include/OvEditor/Panels/AViewControllable.h | 2 +- .../Overload/OvEditor/include/OvEditor/Panels/AssetBrowser.h | 2 +- Sources/Overload/OvEditor/include/OvEditor/Panels/AssetView.h | 2 +- Sources/Overload/OvEditor/include/OvEditor/Panels/Console.h | 2 +- Sources/Overload/OvEditor/include/OvEditor/Panels/GameView.h | 2 +- .../Overload/OvEditor/include/OvEditor/Panels/HardwareInfo.h | 2 +- Sources/Overload/OvEditor/include/OvEditor/Panels/HelpWindow.h | 2 +- Sources/Overload/OvEditor/include/OvEditor/Panels/Hierarchy.h | 2 +- Sources/Overload/OvEditor/include/OvEditor/Panels/Inspector.h | 2 +- .../Overload/OvEditor/include/OvEditor/Panels/MaterialEditor.h | 2 +- Sources/Overload/OvEditor/include/OvEditor/Panels/MenuBar.h | 2 +- Sources/Overload/OvEditor/include/OvEditor/Panels/Profiler.h | 2 +- .../Overload/OvEditor/include/OvEditor/Panels/ProjectSettings.h | 2 +- Sources/Overload/OvEditor/include/OvEditor/Panels/SceneView.h | 2 +- Sources/Overload/OvEditor/include/OvEditor/Panels/Toolbar.h | 2 +- .../Overload/OvEditor/include/OvEditor/Resources/RawShaders.h | 2 +- .../Overload/OvEditor/include/OvEditor/Resources/RawTextures.h | 2 +- .../OvEditor/include/OvEditor/Settings/EditorSettings.h | 2 +- .../Overload/OvEditor/src/OvEditor/Core/CameraController.cpp | 2 +- Sources/Overload/OvEditor/src/OvEditor/Core/Context.cpp | 2 +- Sources/Overload/OvEditor/src/OvEditor/Core/Editor.cpp | 2 +- Sources/Overload/OvEditor/src/OvEditor/Core/EditorActions.cpp | 2 +- Sources/Overload/OvEditor/src/OvEditor/Core/EditorRenderer.cpp | 2 +- Sources/Overload/OvEditor/src/OvEditor/Core/EditorResources.cpp | 2 +- Sources/Overload/OvEditor/src/OvEditor/Core/GizmoBehaviour.cpp | 2 +- Sources/Overload/OvEditor/src/OvEditor/Core/PanelsManager.cpp | 2 +- Sources/Overload/OvEditor/src/OvEditor/Core/ProjectHub.cpp | 2 +- Sources/Overload/OvEditor/src/OvEditor/Main.cpp | 2 +- Sources/Overload/OvEditor/src/OvEditor/Panels/AView.cpp | 2 +- .../Overload/OvEditor/src/OvEditor/Panels/AViewControllable.cpp | 2 +- Sources/Overload/OvEditor/src/OvEditor/Panels/AssetBrowser.cpp | 2 +- Sources/Overload/OvEditor/src/OvEditor/Panels/AssetView.cpp | 2 +- Sources/Overload/OvEditor/src/OvEditor/Panels/Console.cpp | 2 +- Sources/Overload/OvEditor/src/OvEditor/Panels/GameView.cpp | 2 +- Sources/Overload/OvEditor/src/OvEditor/Panels/HardwareInfo.cpp | 2 +- Sources/Overload/OvEditor/src/OvEditor/Panels/HelpWindow.cpp | 2 +- Sources/Overload/OvEditor/src/OvEditor/Panels/Hierarchy.cpp | 2 +- Sources/Overload/OvEditor/src/OvEditor/Panels/Inspector.cpp | 2 +- .../Overload/OvEditor/src/OvEditor/Panels/MaterialEditor.cpp | 2 +- Sources/Overload/OvEditor/src/OvEditor/Panels/MenuBar.cpp | 2 +- Sources/Overload/OvEditor/src/OvEditor/Panels/Profiler.cpp | 2 +- .../Overload/OvEditor/src/OvEditor/Panels/ProjectSettings.cpp | 2 +- Sources/Overload/OvEditor/src/OvEditor/Panels/SceneView.cpp | 2 +- Sources/Overload/OvEditor/src/OvEditor/Panels/Toolbar.cpp | 2 +- Sources/Overload/OvEditor/src/OvEditor/Resources/RawShaders.cpp | 2 +- .../Overload/OvEditor/src/OvEditor/Settings/EditorSettings.cpp | 2 +- Sources/Overload/OvGame/include/OvGame/Core/Application.h | 2 +- Sources/Overload/OvGame/include/OvGame/Core/Context.h | 2 +- Sources/Overload/OvGame/include/OvGame/Core/Game.h | 2 +- Sources/Overload/OvGame/include/OvGame/Core/GameRenderer.h | 2 +- Sources/Overload/OvGame/include/OvGame/Debug/DriverInfo.h | 2 +- Sources/Overload/OvGame/include/OvGame/Debug/FrameInfo.h | 2 +- Sources/Overload/OvGame/include/OvGame/Debug/GameProfiler.h | 2 +- Sources/Overload/OvGame/include/OvGame/Utils/FPSCounter.h | 2 +- Sources/Overload/OvGame/src/OvGame/Core/Application.cpp | 2 +- Sources/Overload/OvGame/src/OvGame/Core/Context.cpp | 2 +- Sources/Overload/OvGame/src/OvGame/Core/Game.cpp | 2 +- Sources/Overload/OvGame/src/OvGame/Core/GameRenderer.cpp | 2 +- Sources/Overload/OvGame/src/OvGame/Debug/DriverInfo.cpp | 2 +- Sources/Overload/OvGame/src/OvGame/Debug/FrameInfo.cpp | 2 +- Sources/Overload/OvGame/src/OvGame/Debug/GameProfiler.cpp | 2 +- Sources/Overload/OvGame/src/OvGame/Main.cpp | 2 +- Sources/Overload/OvGame/src/OvGame/Utils/FPSCounter.cpp | 2 +- Sources/Overload/OvMaths/include/OvMaths/API/Export.h | 2 +- Sources/Overload/OvMaths/include/OvMaths/FMatrix3.h | 2 +- Sources/Overload/OvMaths/include/OvMaths/FMatrix4.h | 2 +- Sources/Overload/OvMaths/include/OvMaths/FQuaternion.h | 2 +- Sources/Overload/OvMaths/include/OvMaths/FTransform.h | 2 +- Sources/Overload/OvMaths/include/OvMaths/FVector2.h | 2 +- Sources/Overload/OvMaths/include/OvMaths/FVector3.h | 2 +- Sources/Overload/OvMaths/include/OvMaths/FVector4.h | 2 +- .../OvMaths/include/OvMaths/Internal/TransformNotifier.h | 2 +- Sources/Overload/OvMaths/src/OvMaths/FMatrix3.cpp | 2 +- Sources/Overload/OvMaths/src/OvMaths/FMatrix4.cpp | 2 +- Sources/Overload/OvMaths/src/OvMaths/FQuaternion.cpp | 2 +- Sources/Overload/OvMaths/src/OvMaths/FTransform.cpp | 2 +- Sources/Overload/OvMaths/src/OvMaths/FVector2.cpp | 2 +- Sources/Overload/OvMaths/src/OvMaths/FVector3.cpp | 2 +- Sources/Overload/OvMaths/src/OvMaths/FVector4.cpp | 2 +- .../Overload/OvMaths/src/OvMaths/Internal/TransformNotifier.cpp | 2 +- Sources/Overload/OvPhysics/include/OvPhysics/API/Export.h | 2 +- .../Overload/OvPhysics/include/OvPhysics/Core/PhysicsEngine.h | 2 +- .../Overload/OvPhysics/include/OvPhysics/Entities/PhysicalBox.h | 2 +- .../OvPhysics/include/OvPhysics/Entities/PhysicalCapsule.h | 2 +- .../OvPhysics/include/OvPhysics/Entities/PhysicalObject.h | 2 +- .../OvPhysics/include/OvPhysics/Entities/PhysicalSphere.h | 2 +- .../Overload/OvPhysics/include/OvPhysics/Entities/RaycastHit.h | 2 +- .../OvPhysics/include/OvPhysics/Settings/BodySettings.h | 2 +- .../OvPhysics/include/OvPhysics/Settings/PhysicsSettings.h | 2 +- Sources/Overload/OvPhysics/include/OvPhysics/Tools/Conversion.h | 2 +- Sources/Overload/OvPhysics/src/OvPhysics/Core/PhysicsEngine.cpp | 2 +- .../Overload/OvPhysics/src/OvPhysics/Entities/PhysicalBox.cpp | 2 +- .../OvPhysics/src/OvPhysics/Entities/PhysicalCapsule.cpp | 2 +- .../OvPhysics/src/OvPhysics/Entities/PhysicalObject.cpp | 2 +- .../OvPhysics/src/OvPhysics/Entities/PhysicalSphere.cpp | 2 +- Sources/Overload/OvPhysics/src/OvPhysics/Tools/Conversion.cpp | 2 +- Sources/Overload/OvRendering/include/OvRendering/API/Export.h | 2 +- .../OvRendering/include/OvRendering/Buffers/EAccessSpecifier.h | 2 +- .../OvRendering/include/OvRendering/Buffers/Framebuffer.h | 2 +- .../OvRendering/include/OvRendering/Buffers/IndexBuffer.h | 2 +- .../include/OvRendering/Buffers/ShaderStorageBuffer.h | 2 +- .../include/OvRendering/Buffers/ShaderStorageBuffer.inl | 2 +- .../OvRendering/include/OvRendering/Buffers/UniformBuffer.h | 2 +- .../OvRendering/include/OvRendering/Buffers/UniformBuffer.inl | 2 +- .../OvRendering/include/OvRendering/Buffers/VertexArray.h | 2 +- .../OvRendering/include/OvRendering/Buffers/VertexArray.inl | 2 +- .../OvRendering/include/OvRendering/Buffers/VertexBuffer.h | 2 +- .../OvRendering/include/OvRendering/Buffers/VertexBuffer.inl | 2 +- .../Overload/OvRendering/include/OvRendering/Context/Driver.h | 2 +- .../Overload/OvRendering/include/OvRendering/Core/Renderer.h | 2 +- .../Overload/OvRendering/include/OvRendering/Core/ShapeDrawer.h | 2 +- Sources/Overload/OvRendering/include/OvRendering/Data/Frustum.h | 2 +- .../Overload/OvRendering/include/OvRendering/Entities/Light.h | 2 +- .../OvRendering/include/OvRendering/Geometry/BoundingSphere.h | 2 +- .../Overload/OvRendering/include/OvRendering/Geometry/Vertex.h | 2 +- .../OvRendering/include/OvRendering/LowRenderer/Camera.h | 2 +- .../Overload/OvRendering/include/OvRendering/Resources/IMesh.h | 2 +- .../include/OvRendering/Resources/Loaders/ModelLoader.h | 2 +- .../include/OvRendering/Resources/Loaders/ShaderLoader.h | 2 +- .../include/OvRendering/Resources/Loaders/TextureLoader.h | 2 +- .../Overload/OvRendering/include/OvRendering/Resources/Mesh.h | 2 +- .../Overload/OvRendering/include/OvRendering/Resources/Model.h | 2 +- .../include/OvRendering/Resources/Parsers/AssimpParser.h | 2 +- .../include/OvRendering/Resources/Parsers/EModelParserFlags.h | 2 +- .../include/OvRendering/Resources/Parsers/IModelParser.h | 2 +- .../Overload/OvRendering/include/OvRendering/Resources/Shader.h | 2 +- .../OvRendering/include/OvRendering/Resources/Texture.h | 2 +- .../OvRendering/include/OvRendering/Resources/UniformInfo.h | 2 +- .../OvRendering/include/OvRendering/Resources/UniformType.h | 2 +- .../OvRendering/include/OvRendering/Settings/DriverSettings.h | 2 +- .../include/OvRendering/Settings/EComparaisonAlgorithm.h | 2 +- .../OvRendering/include/OvRendering/Settings/ECullFace.h | 2 +- .../OvRendering/include/OvRendering/Settings/ECullingOptions.h | 2 +- .../OvRendering/include/OvRendering/Settings/EOperation.h | 2 +- .../OvRendering/include/OvRendering/Settings/EPrimitiveMode.h | 2 +- .../include/OvRendering/Settings/ERasterizationMode.h | 2 +- .../include/OvRendering/Settings/ERenderingCapability.h | 2 +- .../include/OvRendering/Settings/ETextureFilteringMode.h | 2 +- .../OvRendering/src/OvRendering/Buffers/Framebuffer.cpp | 2 +- .../OvRendering/src/OvRendering/Buffers/IndexBuffer.cpp | 2 +- .../OvRendering/src/OvRendering/Buffers/ShaderStorageBuffer.cpp | 2 +- .../OvRendering/src/OvRendering/Buffers/UniformBuffer.cpp | 2 +- .../OvRendering/src/OvRendering/Buffers/VertexArray.cpp | 2 +- Sources/Overload/OvRendering/src/OvRendering/Context/Driver.cpp | 2 +- Sources/Overload/OvRendering/src/OvRendering/Core/Renderer.cpp | 2 +- .../Overload/OvRendering/src/OvRendering/Core/ShapeDrawer.cpp | 2 +- Sources/Overload/OvRendering/src/OvRendering/Data/Frustum.cpp | 2 +- Sources/Overload/OvRendering/src/OvRendering/Entities/Light.cpp | 2 +- .../Overload/OvRendering/src/OvRendering/LowRenderer/Camera.cpp | 2 +- .../src/OvRendering/Resources/Loaders/ModelLoader.cpp | 2 +- .../src/OvRendering/Resources/Loaders/ShaderLoader.cpp | 2 +- .../src/OvRendering/Resources/Loaders/TextureLoader.cpp | 2 +- Sources/Overload/OvRendering/src/OvRendering/Resources/Mesh.cpp | 2 +- .../Overload/OvRendering/src/OvRendering/Resources/Model.cpp | 2 +- .../src/OvRendering/Resources/Parsers/AssimpParser.cpp | 2 +- .../Overload/OvRendering/src/OvRendering/Resources/Shader.cpp | 2 +- .../Overload/OvRendering/src/OvRendering/Resources/Texture.cpp | 2 +- Sources/Overload/OvTools/include/OvTools/API/Export.h | 2 +- Sources/Overload/OvTools/include/OvTools/Eventing/Event.h | 2 +- Sources/Overload/OvTools/include/OvTools/Eventing/Event.inl | 2 +- Sources/Overload/OvTools/include/OvTools/Filesystem/IniFile.h | 2 +- Sources/Overload/OvTools/include/OvTools/Filesystem/IniFile.inl | 2 +- Sources/Overload/OvTools/include/OvTools/Time/Clock.h | 2 +- Sources/Overload/OvTools/include/OvTools/Time/Date.h | 2 +- Sources/Overload/OvTools/include/OvTools/Utils/PathParser.h | 2 +- Sources/Overload/OvTools/include/OvTools/Utils/Random.h | 2 +- .../Overload/OvTools/include/OvTools/Utils/ReferenceOrValue.h | 2 +- Sources/Overload/OvTools/include/OvTools/Utils/String.h | 2 +- Sources/Overload/OvTools/include/OvTools/Utils/SystemCalls.h | 2 +- Sources/Overload/OvTools/src/OvTools/Filesystem/IniFile.cpp | 2 +- Sources/Overload/OvTools/src/OvTools/Time/Clock.cpp | 2 +- Sources/Overload/OvTools/src/OvTools/Time/Date.cpp | 2 +- Sources/Overload/OvTools/src/OvTools/Utils/PathParser.cpp | 2 +- Sources/Overload/OvTools/src/OvTools/Utils/Random.cpp | 2 +- Sources/Overload/OvTools/src/OvTools/Utils/String.cpp | 2 +- Sources/Overload/OvTools/src/OvTools/Utils/SystemCalls.cpp | 2 +- Sources/Overload/OvUI/include/OvUI/API/Export.h | 2 +- Sources/Overload/OvUI/include/OvUI/API/IDrawable.h | 2 +- Sources/Overload/OvUI/include/OvUI/Core/UIManager.h | 2 +- Sources/Overload/OvUI/include/OvUI/Internal/Converter.h | 2 +- Sources/Overload/OvUI/include/OvUI/Internal/EMemoryMode.h | 2 +- Sources/Overload/OvUI/include/OvUI/Internal/TextureID.h | 2 +- Sources/Overload/OvUI/include/OvUI/Internal/WidgetContainer.h | 2 +- Sources/Overload/OvUI/include/OvUI/Modules/Canvas.h | 2 +- Sources/Overload/OvUI/include/OvUI/Panels/APanel.h | 2 +- Sources/Overload/OvUI/include/OvUI/Panels/APanelTransformable.h | 2 +- Sources/Overload/OvUI/include/OvUI/Panels/PanelMenuBar.h | 2 +- Sources/Overload/OvUI/include/OvUI/Panels/PanelUndecorated.h | 2 +- Sources/Overload/OvUI/include/OvUI/Panels/PanelWindow.h | 2 +- Sources/Overload/OvUI/include/OvUI/Plugins/ContextualMenu.h | 2 +- Sources/Overload/OvUI/include/OvUI/Plugins/DDSource.h | 2 +- Sources/Overload/OvUI/include/OvUI/Plugins/DDTarget.h | 2 +- Sources/Overload/OvUI/include/OvUI/Plugins/DataDispatcher.h | 2 +- Sources/Overload/OvUI/include/OvUI/Plugins/IPlugin.h | 2 +- Sources/Overload/OvUI/include/OvUI/Plugins/Pluginable.h | 2 +- Sources/Overload/OvUI/include/OvUI/Settings/Alignment.h | 2 +- .../Overload/OvUI/include/OvUI/Settings/PanelWindowSettings.h | 2 +- Sources/Overload/OvUI/include/OvUI/Styling/EStyle.h | 2 +- Sources/Overload/OvUI/include/OvUI/Types/Color.h | 2 +- Sources/Overload/OvUI/include/OvUI/Widgets/AWidget.h | 2 +- Sources/Overload/OvUI/include/OvUI/Widgets/Buttons/AButton.h | 2 +- Sources/Overload/OvUI/include/OvUI/Widgets/Buttons/Button.h | 2 +- .../Overload/OvUI/include/OvUI/Widgets/Buttons/ButtonArrow.h | 2 +- .../Overload/OvUI/include/OvUI/Widgets/Buttons/ButtonColored.h | 2 +- .../Overload/OvUI/include/OvUI/Widgets/Buttons/ButtonImage.h | 2 +- .../Overload/OvUI/include/OvUI/Widgets/Buttons/ButtonSmall.h | 2 +- Sources/Overload/OvUI/include/OvUI/Widgets/DataWidget.h | 2 +- Sources/Overload/OvUI/include/OvUI/Widgets/Drags/DragDouble.h | 2 +- Sources/Overload/OvUI/include/OvUI/Widgets/Drags/DragFloat.h | 2 +- Sources/Overload/OvUI/include/OvUI/Widgets/Drags/DragInt.h | 2 +- .../OvUI/include/OvUI/Widgets/Drags/DragMultipleDoubles.h | 2 +- .../OvUI/include/OvUI/Widgets/Drags/DragMultipleFloats.h | 2 +- .../Overload/OvUI/include/OvUI/Widgets/Drags/DragMultipleInts.h | 2 +- .../OvUI/include/OvUI/Widgets/Drags/DragMultipleScalars.h | 2 +- .../Overload/OvUI/include/OvUI/Widgets/Drags/DragSingleScalar.h | 2 +- .../OvUI/include/OvUI/Widgets/InputFields/InputDouble.h | 2 +- .../Overload/OvUI/include/OvUI/Widgets/InputFields/InputFloat.h | 2 +- .../Overload/OvUI/include/OvUI/Widgets/InputFields/InputInt.h | 2 +- .../include/OvUI/Widgets/InputFields/InputMultipleDoubles.h | 2 +- .../OvUI/include/OvUI/Widgets/InputFields/InputMultipleFloats.h | 2 +- .../OvUI/include/OvUI/Widgets/InputFields/InputMultipleInts.h | 2 +- .../include/OvUI/Widgets/InputFields/InputMultipleScalars.h | 2 +- .../OvUI/include/OvUI/Widgets/InputFields/InputSingleScalar.h | 2 +- .../Overload/OvUI/include/OvUI/Widgets/InputFields/InputText.h | 2 +- Sources/Overload/OvUI/include/OvUI/Widgets/Layout/Columns.h | 2 +- Sources/Overload/OvUI/include/OvUI/Widgets/Layout/Dummy.h | 2 +- Sources/Overload/OvUI/include/OvUI/Widgets/Layout/Group.h | 2 +- .../OvUI/include/OvUI/Widgets/Layout/GroupCollapsable.h | 2 +- Sources/Overload/OvUI/include/OvUI/Widgets/Layout/NewLine.h | 2 +- Sources/Overload/OvUI/include/OvUI/Widgets/Layout/Spacing.h | 2 +- Sources/Overload/OvUI/include/OvUI/Widgets/Layout/TreeNode.h | 2 +- Sources/Overload/OvUI/include/OvUI/Widgets/Menu/MenuItem.h | 2 +- Sources/Overload/OvUI/include/OvUI/Widgets/Menu/MenuList.h | 2 +- Sources/Overload/OvUI/include/OvUI/Widgets/Plots/APlot.h | 2 +- .../Overload/OvUI/include/OvUI/Widgets/Plots/PlotHistogram.h | 2 +- Sources/Overload/OvUI/include/OvUI/Widgets/Plots/PlotLines.h | 2 +- Sources/Overload/OvUI/include/OvUI/Widgets/Selection/CheckBox.h | 2 +- .../Overload/OvUI/include/OvUI/Widgets/Selection/ColorEdit.h | 2 +- .../Overload/OvUI/include/OvUI/Widgets/Selection/ColorPicker.h | 2 +- Sources/Overload/OvUI/include/OvUI/Widgets/Selection/ComboBox.h | 2 +- .../Overload/OvUI/include/OvUI/Widgets/Selection/RadioButton.h | 2 +- .../OvUI/include/OvUI/Widgets/Selection/RadioButtonLinker.h | 2 +- .../OvUI/include/OvUI/Widgets/Sliders/ESliderOrientation.h | 2 +- .../Overload/OvUI/include/OvUI/Widgets/Sliders/SliderDouble.h | 2 +- .../Overload/OvUI/include/OvUI/Widgets/Sliders/SliderFloat.h | 2 +- Sources/Overload/OvUI/include/OvUI/Widgets/Sliders/SliderInt.h | 2 +- .../OvUI/include/OvUI/Widgets/Sliders/SliderMultipleDoubles.h | 2 +- .../OvUI/include/OvUI/Widgets/Sliders/SliderMultipleFloats.h | 2 +- .../OvUI/include/OvUI/Widgets/Sliders/SliderMultipleInts.h | 2 +- .../OvUI/include/OvUI/Widgets/Sliders/SliderMultipleScalars.h | 2 +- .../OvUI/include/OvUI/Widgets/Sliders/SliderSingleScalar.h | 2 +- Sources/Overload/OvUI/include/OvUI/Widgets/Texts/Text.h | 2 +- .../Overload/OvUI/include/OvUI/Widgets/Texts/TextClickable.h | 2 +- Sources/Overload/OvUI/include/OvUI/Widgets/Texts/TextColored.h | 2 +- Sources/Overload/OvUI/include/OvUI/Widgets/Texts/TextDisabled.h | 2 +- Sources/Overload/OvUI/include/OvUI/Widgets/Texts/TextLabelled.h | 2 +- .../Overload/OvUI/include/OvUI/Widgets/Texts/TextSelectable.h | 2 +- Sources/Overload/OvUI/include/OvUI/Widgets/Texts/TextWrapped.h | 2 +- Sources/Overload/OvUI/include/OvUI/Widgets/Visual/Bullet.h | 2 +- Sources/Overload/OvUI/include/OvUI/Widgets/Visual/Image.h | 2 +- Sources/Overload/OvUI/include/OvUI/Widgets/Visual/ProgressBar.h | 2 +- Sources/Overload/OvUI/include/OvUI/Widgets/Visual/Separator.h | 2 +- Sources/Overload/OvUI/src/OvUI/Core/UIManager.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Internal/Converter.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Internal/WidgetContainer.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Modules/Canvas.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Panels/APanel.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Panels/APanelTransformable.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Panels/PanelMenuBar.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Panels/PanelUndecorated.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Panels/PanelWindow.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Plugins/ContextualMenu.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Types/Color.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Widgets/AWidget.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Widgets/Buttons/Button.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Widgets/Buttons/ButtonArrow.cpp | 2 +- .../Overload/OvUI/src/OvUI/Widgets/Buttons/ButtonColored.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Widgets/Buttons/ButtonImage.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Widgets/Buttons/ButtonSmall.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Widgets/Drags/DragDouble.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Widgets/Drags/DragFloat.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Widgets/Drags/DragInt.cpp | 2 +- .../Overload/OvUI/src/OvUI/Widgets/InputFields/InputDouble.cpp | 2 +- .../Overload/OvUI/src/OvUI/Widgets/InputFields/InputFloat.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Widgets/InputFields/InputInt.cpp | 2 +- .../Overload/OvUI/src/OvUI/Widgets/InputFields/InputText.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Widgets/Layout/Dummy.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Widgets/Layout/Group.cpp | 2 +- .../Overload/OvUI/src/OvUI/Widgets/Layout/GroupCollapsable.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Widgets/Layout/NewLine.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Widgets/Layout/Spacing.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Widgets/Layout/TreeNode.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Widgets/Menu/MenuItem.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Widgets/Menu/MenuList.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Widgets/Plots/APlot.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Widgets/Plots/PlotHistogram.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Widgets/Plots/PlotLines.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Widgets/Selection/CheckBox.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Widgets/Selection/ColorEdit.cpp | 2 +- .../Overload/OvUI/src/OvUI/Widgets/Selection/ColorPicker.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Widgets/Selection/ComboBox.cpp | 2 +- .../Overload/OvUI/src/OvUI/Widgets/Selection/RadioButton.cpp | 2 +- .../OvUI/src/OvUI/Widgets/Selection/RadioButtonLinker.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Widgets/Sliders/SliderDouble.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Widgets/Sliders/SliderFloat.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Widgets/Sliders/SliderInt.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Widgets/Texts/Text.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Widgets/Texts/TextClickable.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Widgets/Texts/TextColored.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Widgets/Texts/TextDisabled.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Widgets/Texts/TextLabelled.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Widgets/Texts/TextSelectable.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Widgets/Texts/TextWrapped.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Widgets/Visual/Bullet.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Widgets/Visual/Image.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Widgets/Visual/ProgressBar.cpp | 2 +- Sources/Overload/OvUI/src/OvUI/Widgets/Visual/Separator.cpp | 2 +- Sources/Overload/OvWindowing/include/OvWindowing/API/Export.h | 2 +- .../Overload/OvWindowing/include/OvWindowing/Context/Device.h | 2 +- .../OvWindowing/include/OvWindowing/Context/EDeviceError.h | 2 +- .../OvWindowing/include/OvWindowing/Cursor/ECursorMode.h | 2 +- .../OvWindowing/include/OvWindowing/Cursor/ECursorShape.h | 2 +- .../OvWindowing/include/OvWindowing/Dialogs/FileDialog.h | 2 +- .../OvWindowing/include/OvWindowing/Dialogs/MessageBox.h | 2 +- .../OvWindowing/include/OvWindowing/Dialogs/OpenFileDialog.h | 2 +- .../OvWindowing/include/OvWindowing/Dialogs/SaveFileDialog.h | 2 +- Sources/Overload/OvWindowing/include/OvWindowing/Inputs/EKey.h | 2 +- .../Overload/OvWindowing/include/OvWindowing/Inputs/EKeyState.h | 2 +- .../OvWindowing/include/OvWindowing/Inputs/EMouseButton.h | 2 +- .../OvWindowing/include/OvWindowing/Inputs/EMouseButtonState.h | 2 +- .../OvWindowing/include/OvWindowing/Inputs/InputManager.h | 2 +- .../OvWindowing/include/OvWindowing/Settings/DeviceSettings.h | 2 +- .../OvWindowing/include/OvWindowing/Settings/WindowSettings.h | 2 +- Sources/Overload/OvWindowing/include/OvWindowing/Window.h | 2 +- Sources/Overload/OvWindowing/src/OvWindowing/Context/Device.cpp | 2 +- .../Overload/OvWindowing/src/OvWindowing/Dialogs/FileDialog.cpp | 2 +- .../Overload/OvWindowing/src/OvWindowing/Dialogs/MessageBox.cpp | 2 +- .../OvWindowing/src/OvWindowing/Dialogs/OpenFileDialog.cpp | 2 +- .../OvWindowing/src/OvWindowing/Dialogs/SaveFileDialog.cpp | 2 +- .../OvWindowing/src/OvWindowing/Inputs/InputManager.cpp | 2 +- Sources/Overload/OvWindowing/src/OvWindowing/Window.cpp | 2 +- 486 files changed, 486 insertions(+), 486 deletions(-) diff --git a/Sources/Overload/OvAnalytics/include/OvAnalytics/API/Export.h b/Sources/Overload/OvAnalytics/include/OvAnalytics/API/Export.h index 8cde8868..2c5e0249 100644 --- a/Sources/Overload/OvAnalytics/include/OvAnalytics/API/Export.h +++ b/Sources/Overload/OvAnalytics/include/OvAnalytics/API/Export.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvAnalytics/include/OvAnalytics/Hardware/CPUInfo.h b/Sources/Overload/OvAnalytics/include/OvAnalytics/Hardware/CPUInfo.h index c7c1085d..614555d1 100644 --- a/Sources/Overload/OvAnalytics/include/OvAnalytics/Hardware/CPUInfo.h +++ b/Sources/Overload/OvAnalytics/include/OvAnalytics/Hardware/CPUInfo.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvAnalytics/include/OvAnalytics/Hardware/GPUInfo.h b/Sources/Overload/OvAnalytics/include/OvAnalytics/Hardware/GPUInfo.h index 7e1a7e4a..779050e3 100644 --- a/Sources/Overload/OvAnalytics/include/OvAnalytics/Hardware/GPUInfo.h +++ b/Sources/Overload/OvAnalytics/include/OvAnalytics/Hardware/GPUInfo.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvAnalytics/include/OvAnalytics/Hardware/HardwareInfo.h b/Sources/Overload/OvAnalytics/include/OvAnalytics/Hardware/HardwareInfo.h index c668ef2a..cdea4dad 100644 --- a/Sources/Overload/OvAnalytics/include/OvAnalytics/Hardware/HardwareInfo.h +++ b/Sources/Overload/OvAnalytics/include/OvAnalytics/Hardware/HardwareInfo.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvAnalytics/include/OvAnalytics/Hardware/HardwareReport.h b/Sources/Overload/OvAnalytics/include/OvAnalytics/Hardware/HardwareReport.h index ce1e0040..96ba9e0e 100644 --- a/Sources/Overload/OvAnalytics/include/OvAnalytics/Hardware/HardwareReport.h +++ b/Sources/Overload/OvAnalytics/include/OvAnalytics/Hardware/HardwareReport.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvAnalytics/include/OvAnalytics/Hardware/RAMInfo.h b/Sources/Overload/OvAnalytics/include/OvAnalytics/Hardware/RAMInfo.h index dfcaf218..1d536e2f 100644 --- a/Sources/Overload/OvAnalytics/include/OvAnalytics/Hardware/RAMInfo.h +++ b/Sources/Overload/OvAnalytics/include/OvAnalytics/Hardware/RAMInfo.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvAnalytics/include/OvAnalytics/Profiling/Profiler.h b/Sources/Overload/OvAnalytics/include/OvAnalytics/Profiling/Profiler.h index e4c41169..c8b40be2 100644 --- a/Sources/Overload/OvAnalytics/include/OvAnalytics/Profiling/Profiler.h +++ b/Sources/Overload/OvAnalytics/include/OvAnalytics/Profiling/Profiler.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvAnalytics/include/OvAnalytics/Profiling/ProfilerReport.h b/Sources/Overload/OvAnalytics/include/OvAnalytics/Profiling/ProfilerReport.h index 6fd3c06a..ffd70910 100644 --- a/Sources/Overload/OvAnalytics/include/OvAnalytics/Profiling/ProfilerReport.h +++ b/Sources/Overload/OvAnalytics/include/OvAnalytics/Profiling/ProfilerReport.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvAnalytics/include/OvAnalytics/Profiling/ProfilerSpy.h b/Sources/Overload/OvAnalytics/include/OvAnalytics/Profiling/ProfilerSpy.h index be484745..cc9fa153 100644 --- a/Sources/Overload/OvAnalytics/include/OvAnalytics/Profiling/ProfilerSpy.h +++ b/Sources/Overload/OvAnalytics/include/OvAnalytics/Profiling/ProfilerSpy.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvAnalytics/src/OvAnalytics/Hardware/CPUInfo.cpp b/Sources/Overload/OvAnalytics/src/OvAnalytics/Hardware/CPUInfo.cpp index e5b919ee..5a930c4e 100644 --- a/Sources/Overload/OvAnalytics/src/OvAnalytics/Hardware/CPUInfo.cpp +++ b/Sources/Overload/OvAnalytics/src/OvAnalytics/Hardware/CPUInfo.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvAnalytics/Hardware/CPUInfo.h" diff --git a/Sources/Overload/OvAnalytics/src/OvAnalytics/Hardware/GPUInfo.cpp b/Sources/Overload/OvAnalytics/src/OvAnalytics/Hardware/GPUInfo.cpp index 112ba3df..f160c453 100644 --- a/Sources/Overload/OvAnalytics/src/OvAnalytics/Hardware/GPUInfo.cpp +++ b/Sources/Overload/OvAnalytics/src/OvAnalytics/Hardware/GPUInfo.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvAnalytics/Hardware/GPUInfo.h" diff --git a/Sources/Overload/OvAnalytics/src/OvAnalytics/Hardware/HardwareInfo.cpp b/Sources/Overload/OvAnalytics/src/OvAnalytics/Hardware/HardwareInfo.cpp index 62e31e99..89f12fab 100644 --- a/Sources/Overload/OvAnalytics/src/OvAnalytics/Hardware/HardwareInfo.cpp +++ b/Sources/Overload/OvAnalytics/src/OvAnalytics/Hardware/HardwareInfo.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvAnalytics/src/OvAnalytics/Hardware/RAMInfo.cpp b/Sources/Overload/OvAnalytics/src/OvAnalytics/Hardware/RAMInfo.cpp index f37e692e..43d2e6c3 100644 --- a/Sources/Overload/OvAnalytics/src/OvAnalytics/Hardware/RAMInfo.cpp +++ b/Sources/Overload/OvAnalytics/src/OvAnalytics/Hardware/RAMInfo.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvAnalytics/Hardware/RAMInfo.h" diff --git a/Sources/Overload/OvAnalytics/src/OvAnalytics/Profiling/Profiler.cpp b/Sources/Overload/OvAnalytics/src/OvAnalytics/Profiling/Profiler.cpp index f9af4b2d..6c1adddb 100644 --- a/Sources/Overload/OvAnalytics/src/OvAnalytics/Profiling/Profiler.cpp +++ b/Sources/Overload/OvAnalytics/src/OvAnalytics/Profiling/Profiler.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvAnalytics/src/OvAnalytics/Profiling/ProfilerSpy.cpp b/Sources/Overload/OvAnalytics/src/OvAnalytics/Profiling/ProfilerSpy.cpp index 6a93e24c..58bf4064 100644 --- a/Sources/Overload/OvAnalytics/src/OvAnalytics/Profiling/ProfilerSpy.cpp +++ b/Sources/Overload/OvAnalytics/src/OvAnalytics/Profiling/ProfilerSpy.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvAnalytics/Profiling/ProfilerSpy.h" diff --git a/Sources/Overload/OvAudio/include/OvAudio/API/Export.h b/Sources/Overload/OvAudio/include/OvAudio/API/Export.h index 870340e9..89e9f9d5 100644 --- a/Sources/Overload/OvAudio/include/OvAudio/API/Export.h +++ b/Sources/Overload/OvAudio/include/OvAudio/API/Export.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvAudio/include/OvAudio/Core/AudioEngine.h b/Sources/Overload/OvAudio/include/OvAudio/Core/AudioEngine.h index bb4baf35..4cfc4466 100644 --- a/Sources/Overload/OvAudio/include/OvAudio/Core/AudioEngine.h +++ b/Sources/Overload/OvAudio/include/OvAudio/Core/AudioEngine.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvAudio/include/OvAudio/Core/AudioPlayer.h b/Sources/Overload/OvAudio/include/OvAudio/Core/AudioPlayer.h index a62ccf70..a6be9bcf 100644 --- a/Sources/Overload/OvAudio/include/OvAudio/Core/AudioPlayer.h +++ b/Sources/Overload/OvAudio/include/OvAudio/Core/AudioPlayer.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvAudio/include/OvAudio/Entities/AudioListener.h b/Sources/Overload/OvAudio/include/OvAudio/Entities/AudioListener.h index 85e36113..18717a66 100644 --- a/Sources/Overload/OvAudio/include/OvAudio/Entities/AudioListener.h +++ b/Sources/Overload/OvAudio/include/OvAudio/Entities/AudioListener.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvAudio/include/OvAudio/Entities/AudioSource.h b/Sources/Overload/OvAudio/include/OvAudio/Entities/AudioSource.h index de047c40..1a5ae3ec 100644 --- a/Sources/Overload/OvAudio/include/OvAudio/Entities/AudioSource.h +++ b/Sources/Overload/OvAudio/include/OvAudio/Entities/AudioSource.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvAudio/include/OvAudio/Resources/Loaders/SoundLoader.h b/Sources/Overload/OvAudio/include/OvAudio/Resources/Loaders/SoundLoader.h index 17216a89..f1068dd5 100644 --- a/Sources/Overload/OvAudio/include/OvAudio/Resources/Loaders/SoundLoader.h +++ b/Sources/Overload/OvAudio/include/OvAudio/Resources/Loaders/SoundLoader.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvAudio/include/OvAudio/Resources/Sound.h b/Sources/Overload/OvAudio/include/OvAudio/Resources/Sound.h index 82fa5451..f36a6ebd 100644 --- a/Sources/Overload/OvAudio/include/OvAudio/Resources/Sound.h +++ b/Sources/Overload/OvAudio/include/OvAudio/Resources/Sound.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvAudio/include/OvAudio/Tracking/SoundStopEventBinder.h b/Sources/Overload/OvAudio/include/OvAudio/Tracking/SoundStopEventBinder.h index 1fe14168..7dc42c4f 100644 --- a/Sources/Overload/OvAudio/include/OvAudio/Tracking/SoundStopEventBinder.h +++ b/Sources/Overload/OvAudio/include/OvAudio/Tracking/SoundStopEventBinder.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvAudio/include/OvAudio/Tracking/SoundTracker.h b/Sources/Overload/OvAudio/include/OvAudio/Tracking/SoundTracker.h index a44d1b77..1f1f0e95 100644 --- a/Sources/Overload/OvAudio/include/OvAudio/Tracking/SoundTracker.h +++ b/Sources/Overload/OvAudio/include/OvAudio/Tracking/SoundTracker.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvAudio/src/OvAudio/Core/AudioEngine.cpp b/Sources/Overload/OvAudio/src/OvAudio/Core/AudioEngine.cpp index e1910815..7ab7d46a 100644 --- a/Sources/Overload/OvAudio/src/OvAudio/Core/AudioEngine.cpp +++ b/Sources/Overload/OvAudio/src/OvAudio/Core/AudioEngine.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvAudio/Core/AudioEngine.h" diff --git a/Sources/Overload/OvAudio/src/OvAudio/Core/AudioPlayer.cpp b/Sources/Overload/OvAudio/src/OvAudio/Core/AudioPlayer.cpp index f0bfecf6..0a003a1e 100644 --- a/Sources/Overload/OvAudio/src/OvAudio/Core/AudioPlayer.cpp +++ b/Sources/Overload/OvAudio/src/OvAudio/Core/AudioPlayer.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvAudio/src/OvAudio/Entities/AudioListener.cpp b/Sources/Overload/OvAudio/src/OvAudio/Entities/AudioListener.cpp index 7ee79051..63c9bd11 100644 --- a/Sources/Overload/OvAudio/src/OvAudio/Entities/AudioListener.cpp +++ b/Sources/Overload/OvAudio/src/OvAudio/Entities/AudioListener.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvAudio/Entities/AudioListener.h" diff --git a/Sources/Overload/OvAudio/src/OvAudio/Entities/AudioSource.cpp b/Sources/Overload/OvAudio/src/OvAudio/Entities/AudioSource.cpp index a60ee1b9..3d7fad75 100644 --- a/Sources/Overload/OvAudio/src/OvAudio/Entities/AudioSource.cpp +++ b/Sources/Overload/OvAudio/src/OvAudio/Entities/AudioSource.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvAudio/src/OvAudio/Resources/Loaders/SoundLoader.cpp b/Sources/Overload/OvAudio/src/OvAudio/Resources/Loaders/SoundLoader.cpp index 10244052..70231245 100644 --- a/Sources/Overload/OvAudio/src/OvAudio/Resources/Loaders/SoundLoader.cpp +++ b/Sources/Overload/OvAudio/src/OvAudio/Resources/Loaders/SoundLoader.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvAudio/Resources/Loaders/SoundLoader.h" diff --git a/Sources/Overload/OvAudio/src/OvAudio/Resources/Sound.cpp b/Sources/Overload/OvAudio/src/OvAudio/Resources/Sound.cpp index ebb0d794..448e3af1 100644 --- a/Sources/Overload/OvAudio/src/OvAudio/Resources/Sound.cpp +++ b/Sources/Overload/OvAudio/src/OvAudio/Resources/Sound.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvAudio/Resources/Sound.h" diff --git a/Sources/Overload/OvAudio/src/OvAudio/Tracking/SoundStopEventBinder.cpp b/Sources/Overload/OvAudio/src/OvAudio/Tracking/SoundStopEventBinder.cpp index f2fd4650..72757ee2 100644 --- a/Sources/Overload/OvAudio/src/OvAudio/Tracking/SoundStopEventBinder.cpp +++ b/Sources/Overload/OvAudio/src/OvAudio/Tracking/SoundStopEventBinder.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvAudio/Tracking/SoundStopEventBinder.h" diff --git a/Sources/Overload/OvAudio/src/OvAudio/Tracking/SoundTracker.cpp b/Sources/Overload/OvAudio/src/OvAudio/Tracking/SoundTracker.cpp index 3057993e..64ec3547 100644 --- a/Sources/Overload/OvAudio/src/OvAudio/Tracking/SoundTracker.cpp +++ b/Sources/Overload/OvAudio/src/OvAudio/Tracking/SoundTracker.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvAudio/Tracking/SoundTracker.h" diff --git a/Sources/Overload/OvCore/include/OvCore/API/Export.h b/Sources/Overload/OvCore/include/OvCore/API/Export.h index c75ffaed..83da479f 100644 --- a/Sources/Overload/OvCore/include/OvCore/API/Export.h +++ b/Sources/Overload/OvCore/include/OvCore/API/Export.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/API/IInspectorItem.h b/Sources/Overload/OvCore/include/OvCore/API/IInspectorItem.h index 34bbffbd..ddcae58a 100644 --- a/Sources/Overload/OvCore/include/OvCore/API/IInspectorItem.h +++ b/Sources/Overload/OvCore/include/OvCore/API/IInspectorItem.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/API/ISerializable.h b/Sources/Overload/OvCore/include/OvCore/API/ISerializable.h index c8495896..9242be56 100644 --- a/Sources/Overload/OvCore/include/OvCore/API/ISerializable.h +++ b/Sources/Overload/OvCore/include/OvCore/API/ISerializable.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/ECS/Actor.h b/Sources/Overload/OvCore/include/OvCore/ECS/Actor.h index ccd7e8fc..74d41660 100644 --- a/Sources/Overload/OvCore/include/OvCore/ECS/Actor.h +++ b/Sources/Overload/OvCore/include/OvCore/ECS/Actor.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/ECS/Actor.inl b/Sources/Overload/OvCore/include/OvCore/ECS/Actor.inl index 173c1b42..3b9a5491 100644 --- a/Sources/Overload/OvCore/include/OvCore/ECS/Actor.inl +++ b/Sources/Overload/OvCore/include/OvCore/ECS/Actor.inl @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/ECS/Components/AComponent.h b/Sources/Overload/OvCore/include/OvCore/ECS/Components/AComponent.h index 8b104937..9392f9f1 100644 --- a/Sources/Overload/OvCore/include/OvCore/ECS/Components/AComponent.h +++ b/Sources/Overload/OvCore/include/OvCore/ECS/Components/AComponent.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/ECS/Components/Behaviour.h b/Sources/Overload/OvCore/include/OvCore/ECS/Components/Behaviour.h index aec03e7d..2d8959f5 100644 --- a/Sources/Overload/OvCore/include/OvCore/ECS/Components/Behaviour.h +++ b/Sources/Overload/OvCore/include/OvCore/ECS/Components/Behaviour.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/ECS/Components/Behaviour.inl b/Sources/Overload/OvCore/include/OvCore/ECS/Components/Behaviour.inl index 76605033..7ac75836 100644 --- a/Sources/Overload/OvCore/include/OvCore/ECS/Components/Behaviour.inl +++ b/Sources/Overload/OvCore/include/OvCore/ECS/Components/Behaviour.inl @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/ECS/Components/CAmbientBoxLight.h b/Sources/Overload/OvCore/include/OvCore/ECS/Components/CAmbientBoxLight.h index 63c49f3c..0c4839c7 100644 --- a/Sources/Overload/OvCore/include/OvCore/ECS/Components/CAmbientBoxLight.h +++ b/Sources/Overload/OvCore/include/OvCore/ECS/Components/CAmbientBoxLight.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/ECS/Components/CAmbientSphereLight.h b/Sources/Overload/OvCore/include/OvCore/ECS/Components/CAmbientSphereLight.h index b03fc7e7..a129a1de 100644 --- a/Sources/Overload/OvCore/include/OvCore/ECS/Components/CAmbientSphereLight.h +++ b/Sources/Overload/OvCore/include/OvCore/ECS/Components/CAmbientSphereLight.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/ECS/Components/CAudioListener.h b/Sources/Overload/OvCore/include/OvCore/ECS/Components/CAudioListener.h index 506b8eb1..ff081214 100644 --- a/Sources/Overload/OvCore/include/OvCore/ECS/Components/CAudioListener.h +++ b/Sources/Overload/OvCore/include/OvCore/ECS/Components/CAudioListener.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/ECS/Components/CAudioSource.h b/Sources/Overload/OvCore/include/OvCore/ECS/Components/CAudioSource.h index 82a7264e..a976b75a 100644 --- a/Sources/Overload/OvCore/include/OvCore/ECS/Components/CAudioSource.h +++ b/Sources/Overload/OvCore/include/OvCore/ECS/Components/CAudioSource.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/ECS/Components/CCamera.h b/Sources/Overload/OvCore/include/OvCore/ECS/Components/CCamera.h index 0e435a40..507c1197 100644 --- a/Sources/Overload/OvCore/include/OvCore/ECS/Components/CCamera.h +++ b/Sources/Overload/OvCore/include/OvCore/ECS/Components/CCamera.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/ECS/Components/CDirectionalLight.h b/Sources/Overload/OvCore/include/OvCore/ECS/Components/CDirectionalLight.h index c4a162cb..3ca0ea90 100644 --- a/Sources/Overload/OvCore/include/OvCore/ECS/Components/CDirectionalLight.h +++ b/Sources/Overload/OvCore/include/OvCore/ECS/Components/CDirectionalLight.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/ECS/Components/CLight.h b/Sources/Overload/OvCore/include/OvCore/ECS/Components/CLight.h index 4ae21ef2..a8d7b253 100644 --- a/Sources/Overload/OvCore/include/OvCore/ECS/Components/CLight.h +++ b/Sources/Overload/OvCore/include/OvCore/ECS/Components/CLight.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/ECS/Components/CMaterialRenderer.h b/Sources/Overload/OvCore/include/OvCore/ECS/Components/CMaterialRenderer.h index c9172975..96f8bf21 100644 --- a/Sources/Overload/OvCore/include/OvCore/ECS/Components/CMaterialRenderer.h +++ b/Sources/Overload/OvCore/include/OvCore/ECS/Components/CMaterialRenderer.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/ECS/Components/CModelRenderer.h b/Sources/Overload/OvCore/include/OvCore/ECS/Components/CModelRenderer.h index e62a7086..d6fcdae7 100644 --- a/Sources/Overload/OvCore/include/OvCore/ECS/Components/CModelRenderer.h +++ b/Sources/Overload/OvCore/include/OvCore/ECS/Components/CModelRenderer.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/ECS/Components/CPhysicalBox.h b/Sources/Overload/OvCore/include/OvCore/ECS/Components/CPhysicalBox.h index dea599e2..24c87a0b 100644 --- a/Sources/Overload/OvCore/include/OvCore/ECS/Components/CPhysicalBox.h +++ b/Sources/Overload/OvCore/include/OvCore/ECS/Components/CPhysicalBox.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/ECS/Components/CPhysicalCapsule.h b/Sources/Overload/OvCore/include/OvCore/ECS/Components/CPhysicalCapsule.h index 9e5a7c0c..4abf1dcd 100644 --- a/Sources/Overload/OvCore/include/OvCore/ECS/Components/CPhysicalCapsule.h +++ b/Sources/Overload/OvCore/include/OvCore/ECS/Components/CPhysicalCapsule.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/ECS/Components/CPhysicalObject.h b/Sources/Overload/OvCore/include/OvCore/ECS/Components/CPhysicalObject.h index 10109787..5d5ff5fc 100644 --- a/Sources/Overload/OvCore/include/OvCore/ECS/Components/CPhysicalObject.h +++ b/Sources/Overload/OvCore/include/OvCore/ECS/Components/CPhysicalObject.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/ECS/Components/CPhysicalSphere.h b/Sources/Overload/OvCore/include/OvCore/ECS/Components/CPhysicalSphere.h index 71b85717..6256c457 100644 --- a/Sources/Overload/OvCore/include/OvCore/ECS/Components/CPhysicalSphere.h +++ b/Sources/Overload/OvCore/include/OvCore/ECS/Components/CPhysicalSphere.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/ECS/Components/CPointLight.h b/Sources/Overload/OvCore/include/OvCore/ECS/Components/CPointLight.h index a61a5769..774ae69f 100644 --- a/Sources/Overload/OvCore/include/OvCore/ECS/Components/CPointLight.h +++ b/Sources/Overload/OvCore/include/OvCore/ECS/Components/CPointLight.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/ECS/Components/CSpotLight.h b/Sources/Overload/OvCore/include/OvCore/ECS/Components/CSpotLight.h index 9972c85c..41b47ee2 100644 --- a/Sources/Overload/OvCore/include/OvCore/ECS/Components/CSpotLight.h +++ b/Sources/Overload/OvCore/include/OvCore/ECS/Components/CSpotLight.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/ECS/Components/CTransform.h b/Sources/Overload/OvCore/include/OvCore/ECS/Components/CTransform.h index 0fcccc23..294ea434 100644 --- a/Sources/Overload/OvCore/include/OvCore/ECS/Components/CTransform.h +++ b/Sources/Overload/OvCore/include/OvCore/ECS/Components/CTransform.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/ECS/PhysicsWrapper.h b/Sources/Overload/OvCore/include/OvCore/ECS/PhysicsWrapper.h index 65be2dd0..44ec5ee9 100644 --- a/Sources/Overload/OvCore/include/OvCore/ECS/PhysicsWrapper.h +++ b/Sources/Overload/OvCore/include/OvCore/ECS/PhysicsWrapper.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/ECS/Renderer.h b/Sources/Overload/OvCore/include/OvCore/ECS/Renderer.h index 95eb262b..87d10d26 100644 --- a/Sources/Overload/OvCore/include/OvCore/ECS/Renderer.h +++ b/Sources/Overload/OvCore/include/OvCore/ECS/Renderer.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/Global/ServiceLocator.h b/Sources/Overload/OvCore/include/OvCore/Global/ServiceLocator.h index b0a1c84f..b30541e6 100644 --- a/Sources/Overload/OvCore/include/OvCore/Global/ServiceLocator.h +++ b/Sources/Overload/OvCore/include/OvCore/Global/ServiceLocator.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/Helpers/GUIDrawer.h b/Sources/Overload/OvCore/include/OvCore/Helpers/GUIDrawer.h index 1e24626d..2596498f 100644 --- a/Sources/Overload/OvCore/include/OvCore/Helpers/GUIDrawer.h +++ b/Sources/Overload/OvCore/include/OvCore/Helpers/GUIDrawer.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/Helpers/GUIDrawer.inl b/Sources/Overload/OvCore/include/OvCore/Helpers/GUIDrawer.inl index 429693ce..ad178417 100644 --- a/Sources/Overload/OvCore/include/OvCore/Helpers/GUIDrawer.inl +++ b/Sources/Overload/OvCore/include/OvCore/Helpers/GUIDrawer.inl @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/Helpers/Serializer.h b/Sources/Overload/OvCore/include/OvCore/Helpers/Serializer.h index 605d9503..d12272fa 100644 --- a/Sources/Overload/OvCore/include/OvCore/Helpers/Serializer.h +++ b/Sources/Overload/OvCore/include/OvCore/Helpers/Serializer.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/ResourceManagement/AResourceManager.h b/Sources/Overload/OvCore/include/OvCore/ResourceManagement/AResourceManager.h index 61bbe3f1..a3acff28 100644 --- a/Sources/Overload/OvCore/include/OvCore/ResourceManagement/AResourceManager.h +++ b/Sources/Overload/OvCore/include/OvCore/ResourceManagement/AResourceManager.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/ResourceManagement/AResourceManager.inl b/Sources/Overload/OvCore/include/OvCore/ResourceManagement/AResourceManager.inl index 1a6fcc80..2ca50f1b 100644 --- a/Sources/Overload/OvCore/include/OvCore/ResourceManagement/AResourceManager.inl +++ b/Sources/Overload/OvCore/include/OvCore/ResourceManagement/AResourceManager.inl @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/ResourceManagement/MaterialManager.h b/Sources/Overload/OvCore/include/OvCore/ResourceManagement/MaterialManager.h index 0f79df74..64537fbb 100644 --- a/Sources/Overload/OvCore/include/OvCore/ResourceManagement/MaterialManager.h +++ b/Sources/Overload/OvCore/include/OvCore/ResourceManagement/MaterialManager.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/ResourceManagement/ModelManager.h b/Sources/Overload/OvCore/include/OvCore/ResourceManagement/ModelManager.h index 63d3c25e..5b181c86 100644 --- a/Sources/Overload/OvCore/include/OvCore/ResourceManagement/ModelManager.h +++ b/Sources/Overload/OvCore/include/OvCore/ResourceManagement/ModelManager.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/ResourceManagement/ShaderManager.h b/Sources/Overload/OvCore/include/OvCore/ResourceManagement/ShaderManager.h index d9269f99..37265777 100644 --- a/Sources/Overload/OvCore/include/OvCore/ResourceManagement/ShaderManager.h +++ b/Sources/Overload/OvCore/include/OvCore/ResourceManagement/ShaderManager.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/ResourceManagement/SoundManager.h b/Sources/Overload/OvCore/include/OvCore/ResourceManagement/SoundManager.h index 115a815f..c8282404 100644 --- a/Sources/Overload/OvCore/include/OvCore/ResourceManagement/SoundManager.h +++ b/Sources/Overload/OvCore/include/OvCore/ResourceManagement/SoundManager.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/ResourceManagement/TextureManager.h b/Sources/Overload/OvCore/include/OvCore/ResourceManagement/TextureManager.h index 5c7a5b37..f9d52562 100644 --- a/Sources/Overload/OvCore/include/OvCore/ResourceManagement/TextureManager.h +++ b/Sources/Overload/OvCore/include/OvCore/ResourceManagement/TextureManager.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/Resources/Loaders/MaterialLoader.h b/Sources/Overload/OvCore/include/OvCore/Resources/Loaders/MaterialLoader.h index d57f3583..17e6ddb1 100644 --- a/Sources/Overload/OvCore/include/OvCore/Resources/Loaders/MaterialLoader.h +++ b/Sources/Overload/OvCore/include/OvCore/Resources/Loaders/MaterialLoader.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/Resources/Material.h b/Sources/Overload/OvCore/include/OvCore/Resources/Material.h index c5a9467d..0ac020d0 100644 --- a/Sources/Overload/OvCore/include/OvCore/Resources/Material.h +++ b/Sources/Overload/OvCore/include/OvCore/Resources/Material.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/Resources/Material.inl b/Sources/Overload/OvCore/include/OvCore/Resources/Material.inl index c8959fb5..20e3190d 100644 --- a/Sources/Overload/OvCore/include/OvCore/Resources/Material.inl +++ b/Sources/Overload/OvCore/include/OvCore/Resources/Material.inl @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/SceneSystem/Scene.h b/Sources/Overload/OvCore/include/OvCore/SceneSystem/Scene.h index 52f114b8..b10eea27 100644 --- a/Sources/Overload/OvCore/include/OvCore/SceneSystem/Scene.h +++ b/Sources/Overload/OvCore/include/OvCore/SceneSystem/Scene.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/SceneSystem/SceneManager.h b/Sources/Overload/OvCore/include/OvCore/SceneSystem/SceneManager.h index e6911ab8..0a9bd7f0 100644 --- a/Sources/Overload/OvCore/include/OvCore/SceneSystem/SceneManager.h +++ b/Sources/Overload/OvCore/include/OvCore/SceneSystem/SceneManager.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/Scripting/LuaActorBinder.h b/Sources/Overload/OvCore/include/OvCore/Scripting/LuaActorBinder.h index 7191c56e..d23ba386 100644 --- a/Sources/Overload/OvCore/include/OvCore/Scripting/LuaActorBinder.h +++ b/Sources/Overload/OvCore/include/OvCore/Scripting/LuaActorBinder.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/Scripting/LuaBinder.h b/Sources/Overload/OvCore/include/OvCore/Scripting/LuaBinder.h index 190be088..06a0575d 100644 --- a/Sources/Overload/OvCore/include/OvCore/Scripting/LuaBinder.h +++ b/Sources/Overload/OvCore/include/OvCore/Scripting/LuaBinder.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/Scripting/LuaComponentBinder.h b/Sources/Overload/OvCore/include/OvCore/Scripting/LuaComponentBinder.h index 59a71f9b..939cc00a 100644 --- a/Sources/Overload/OvCore/include/OvCore/Scripting/LuaComponentBinder.h +++ b/Sources/Overload/OvCore/include/OvCore/Scripting/LuaComponentBinder.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/Scripting/LuaGlobalsBinder.h b/Sources/Overload/OvCore/include/OvCore/Scripting/LuaGlobalsBinder.h index 951c095c..a2e9564d 100644 --- a/Sources/Overload/OvCore/include/OvCore/Scripting/LuaGlobalsBinder.h +++ b/Sources/Overload/OvCore/include/OvCore/Scripting/LuaGlobalsBinder.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/Scripting/LuaMathsBinder.h b/Sources/Overload/OvCore/include/OvCore/Scripting/LuaMathsBinder.h index 15acd730..e4a5a28d 100644 --- a/Sources/Overload/OvCore/include/OvCore/Scripting/LuaMathsBinder.h +++ b/Sources/Overload/OvCore/include/OvCore/Scripting/LuaMathsBinder.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/include/OvCore/Scripting/ScriptInterpreter.h b/Sources/Overload/OvCore/include/OvCore/Scripting/ScriptInterpreter.h index 9e56f6d0..6f6bd9a6 100644 --- a/Sources/Overload/OvCore/include/OvCore/Scripting/ScriptInterpreter.h +++ b/Sources/Overload/OvCore/include/OvCore/Scripting/ScriptInterpreter.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvCore/src/OvCore/ECS/Actor.cpp b/Sources/Overload/OvCore/src/OvCore/ECS/Actor.cpp index 528b0f4d..400fd2b7 100644 --- a/Sources/Overload/OvCore/src/OvCore/ECS/Actor.cpp +++ b/Sources/Overload/OvCore/src/OvCore/ECS/Actor.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvCore/src/OvCore/ECS/Components/AComponent.cpp b/Sources/Overload/OvCore/src/OvCore/ECS/Components/AComponent.cpp index e6d07d4f..ede9c8e2 100644 --- a/Sources/Overload/OvCore/src/OvCore/ECS/Components/AComponent.cpp +++ b/Sources/Overload/OvCore/src/OvCore/ECS/Components/AComponent.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvCore/ECS/Components/AComponent.h" diff --git a/Sources/Overload/OvCore/src/OvCore/ECS/Components/Behaviour.cpp b/Sources/Overload/OvCore/src/OvCore/ECS/Components/Behaviour.cpp index 3c316309..6eae4c74 100644 --- a/Sources/Overload/OvCore/src/OvCore/ECS/Components/Behaviour.cpp +++ b/Sources/Overload/OvCore/src/OvCore/ECS/Components/Behaviour.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvCore/src/OvCore/ECS/Components/CAmbientBoxLight.cpp b/Sources/Overload/OvCore/src/OvCore/ECS/Components/CAmbientBoxLight.cpp index df1f730a..43c7d144 100644 --- a/Sources/Overload/OvCore/src/OvCore/ECS/Components/CAmbientBoxLight.cpp +++ b/Sources/Overload/OvCore/src/OvCore/ECS/Components/CAmbientBoxLight.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvCore/src/OvCore/ECS/Components/CAmbientSphereLight.cpp b/Sources/Overload/OvCore/src/OvCore/ECS/Components/CAmbientSphereLight.cpp index 6582f39b..ed6d8e8a 100644 --- a/Sources/Overload/OvCore/src/OvCore/ECS/Components/CAmbientSphereLight.cpp +++ b/Sources/Overload/OvCore/src/OvCore/ECS/Components/CAmbientSphereLight.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvCore/src/OvCore/ECS/Components/CAudioListener.cpp b/Sources/Overload/OvCore/src/OvCore/ECS/Components/CAudioListener.cpp index 20fe099f..55857229 100644 --- a/Sources/Overload/OvCore/src/OvCore/ECS/Components/CAudioListener.cpp +++ b/Sources/Overload/OvCore/src/OvCore/ECS/Components/CAudioListener.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvCore/ECS/Components/CAudioListener.h" diff --git a/Sources/Overload/OvCore/src/OvCore/ECS/Components/CAudioSource.cpp b/Sources/Overload/OvCore/src/OvCore/ECS/Components/CAudioSource.cpp index 283f8f84..624c2633 100644 --- a/Sources/Overload/OvCore/src/OvCore/ECS/Components/CAudioSource.cpp +++ b/Sources/Overload/OvCore/src/OvCore/ECS/Components/CAudioSource.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvCore/src/OvCore/ECS/Components/CCamera.cpp b/Sources/Overload/OvCore/src/OvCore/ECS/Components/CCamera.cpp index b833f199..2f358af3 100644 --- a/Sources/Overload/OvCore/src/OvCore/ECS/Components/CCamera.cpp +++ b/Sources/Overload/OvCore/src/OvCore/ECS/Components/CCamera.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvCore/src/OvCore/ECS/Components/CDirectionalLight.cpp b/Sources/Overload/OvCore/src/OvCore/ECS/Components/CDirectionalLight.cpp index 6dde5dd6..4f303e81 100644 --- a/Sources/Overload/OvCore/src/OvCore/ECS/Components/CDirectionalLight.cpp +++ b/Sources/Overload/OvCore/src/OvCore/ECS/Components/CDirectionalLight.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvCore/src/OvCore/ECS/Components/CLight.cpp b/Sources/Overload/OvCore/src/OvCore/ECS/Components/CLight.cpp index f35d0c1f..91fa1835 100644 --- a/Sources/Overload/OvCore/src/OvCore/ECS/Components/CLight.cpp +++ b/Sources/Overload/OvCore/src/OvCore/ECS/Components/CLight.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvCore/src/OvCore/ECS/Components/CMaterialRenderer.cpp b/Sources/Overload/OvCore/src/OvCore/ECS/Components/CMaterialRenderer.cpp index 14284322..84bbf415 100644 --- a/Sources/Overload/OvCore/src/OvCore/ECS/Components/CMaterialRenderer.cpp +++ b/Sources/Overload/OvCore/src/OvCore/ECS/Components/CMaterialRenderer.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvCore/src/OvCore/ECS/Components/CModelRenderer.cpp b/Sources/Overload/OvCore/src/OvCore/ECS/Components/CModelRenderer.cpp index 7451a978..7136e87c 100644 --- a/Sources/Overload/OvCore/src/OvCore/ECS/Components/CModelRenderer.cpp +++ b/Sources/Overload/OvCore/src/OvCore/ECS/Components/CModelRenderer.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvCore/src/OvCore/ECS/Components/CPhysicalBox.cpp b/Sources/Overload/OvCore/src/OvCore/ECS/Components/CPhysicalBox.cpp index 01adc952..4228b2b3 100644 --- a/Sources/Overload/OvCore/src/OvCore/ECS/Components/CPhysicalBox.cpp +++ b/Sources/Overload/OvCore/src/OvCore/ECS/Components/CPhysicalBox.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvCore/src/OvCore/ECS/Components/CPhysicalCapsule.cpp b/Sources/Overload/OvCore/src/OvCore/ECS/Components/CPhysicalCapsule.cpp index 50b4121b..83fc7a10 100644 --- a/Sources/Overload/OvCore/src/OvCore/ECS/Components/CPhysicalCapsule.cpp +++ b/Sources/Overload/OvCore/src/OvCore/ECS/Components/CPhysicalCapsule.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvCore/src/OvCore/ECS/Components/CPhysicalObject.cpp b/Sources/Overload/OvCore/src/OvCore/ECS/Components/CPhysicalObject.cpp index 18a4b838..e542613b 100644 --- a/Sources/Overload/OvCore/src/OvCore/ECS/Components/CPhysicalObject.cpp +++ b/Sources/Overload/OvCore/src/OvCore/ECS/Components/CPhysicalObject.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvCore/src/OvCore/ECS/Components/CPhysicalSphere.cpp b/Sources/Overload/OvCore/src/OvCore/ECS/Components/CPhysicalSphere.cpp index b51e06d7..410903f6 100644 --- a/Sources/Overload/OvCore/src/OvCore/ECS/Components/CPhysicalSphere.cpp +++ b/Sources/Overload/OvCore/src/OvCore/ECS/Components/CPhysicalSphere.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvCore/src/OvCore/ECS/Components/CPointLight.cpp b/Sources/Overload/OvCore/src/OvCore/ECS/Components/CPointLight.cpp index c3f71b58..b771fa58 100644 --- a/Sources/Overload/OvCore/src/OvCore/ECS/Components/CPointLight.cpp +++ b/Sources/Overload/OvCore/src/OvCore/ECS/Components/CPointLight.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvCore/src/OvCore/ECS/Components/CSpotLight.cpp b/Sources/Overload/OvCore/src/OvCore/ECS/Components/CSpotLight.cpp index 979d0a8f..8f9ef840 100644 --- a/Sources/Overload/OvCore/src/OvCore/ECS/Components/CSpotLight.cpp +++ b/Sources/Overload/OvCore/src/OvCore/ECS/Components/CSpotLight.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvCore/src/OvCore/ECS/Components/CTransform.cpp b/Sources/Overload/OvCore/src/OvCore/ECS/Components/CTransform.cpp index 6a8be30d..06c0603b 100644 --- a/Sources/Overload/OvCore/src/OvCore/ECS/Components/CTransform.cpp +++ b/Sources/Overload/OvCore/src/OvCore/ECS/Components/CTransform.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvCore/src/OvCore/ECS/PhysicsWrapper.cpp b/Sources/Overload/OvCore/src/OvCore/ECS/PhysicsWrapper.cpp index 9d3cf188..b306efde 100644 --- a/Sources/Overload/OvCore/src/OvCore/ECS/PhysicsWrapper.cpp +++ b/Sources/Overload/OvCore/src/OvCore/ECS/PhysicsWrapper.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvCore/ECS/PhysicsWrapper.h" diff --git a/Sources/Overload/OvCore/src/OvCore/ECS/Renderer.cpp b/Sources/Overload/OvCore/src/OvCore/ECS/Renderer.cpp index d52da5f5..a3112cb7 100644 --- a/Sources/Overload/OvCore/src/OvCore/ECS/Renderer.cpp +++ b/Sources/Overload/OvCore/src/OvCore/ECS/Renderer.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvCore/src/OvCore/Global/ServiceLocator.cpp b/Sources/Overload/OvCore/src/OvCore/Global/ServiceLocator.cpp index 8a3d9b28..47302f89 100644 --- a/Sources/Overload/OvCore/src/OvCore/Global/ServiceLocator.cpp +++ b/Sources/Overload/OvCore/src/OvCore/Global/ServiceLocator.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvCore/Global/ServiceLocator.h" diff --git a/Sources/Overload/OvCore/src/OvCore/Helpers/GUIDrawer.cpp b/Sources/Overload/OvCore/src/OvCore/Helpers/GUIDrawer.cpp index 3fe78c8c..b4219f55 100644 --- a/Sources/Overload/OvCore/src/OvCore/Helpers/GUIDrawer.cpp +++ b/Sources/Overload/OvCore/src/OvCore/Helpers/GUIDrawer.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvCore/src/OvCore/Helpers/Serializer.cpp b/Sources/Overload/OvCore/src/OvCore/Helpers/Serializer.cpp index c314400d..8af207d8 100644 --- a/Sources/Overload/OvCore/src/OvCore/Helpers/Serializer.cpp +++ b/Sources/Overload/OvCore/src/OvCore/Helpers/Serializer.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvCore/ResourceManagement/TextureManager.h" diff --git a/Sources/Overload/OvCore/src/OvCore/ResourceManagement/MaterialManager.cpp b/Sources/Overload/OvCore/src/OvCore/ResourceManagement/MaterialManager.cpp index a17cca2e..156d8ca6 100644 --- a/Sources/Overload/OvCore/src/OvCore/ResourceManagement/MaterialManager.cpp +++ b/Sources/Overload/OvCore/src/OvCore/ResourceManagement/MaterialManager.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvCore/ResourceManagement/MaterialManager.h" diff --git a/Sources/Overload/OvCore/src/OvCore/ResourceManagement/ModelManager.cpp b/Sources/Overload/OvCore/src/OvCore/ResourceManagement/ModelManager.cpp index 0c69c48d..b1d1668f 100644 --- a/Sources/Overload/OvCore/src/OvCore/ResourceManagement/ModelManager.cpp +++ b/Sources/Overload/OvCore/src/OvCore/ResourceManagement/ModelManager.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvCore/ResourceManagement/ModelManager.h" diff --git a/Sources/Overload/OvCore/src/OvCore/ResourceManagement/ShaderManager.cpp b/Sources/Overload/OvCore/src/OvCore/ResourceManagement/ShaderManager.cpp index 254b2b52..27f34a36 100644 --- a/Sources/Overload/OvCore/src/OvCore/ResourceManagement/ShaderManager.cpp +++ b/Sources/Overload/OvCore/src/OvCore/ResourceManagement/ShaderManager.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvCore/ResourceManagement/ShaderManager.h" diff --git a/Sources/Overload/OvCore/src/OvCore/ResourceManagement/SoundManager.cpp b/Sources/Overload/OvCore/src/OvCore/ResourceManagement/SoundManager.cpp index 41bfdd09..57ace773 100644 --- a/Sources/Overload/OvCore/src/OvCore/ResourceManagement/SoundManager.cpp +++ b/Sources/Overload/OvCore/src/OvCore/ResourceManagement/SoundManager.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvCore/ResourceManagement/SoundManager.h" diff --git a/Sources/Overload/OvCore/src/OvCore/ResourceManagement/TextureManager.cpp b/Sources/Overload/OvCore/src/OvCore/ResourceManagement/TextureManager.cpp index 6736ca79..027cf46f 100644 --- a/Sources/Overload/OvCore/src/OvCore/ResourceManagement/TextureManager.cpp +++ b/Sources/Overload/OvCore/src/OvCore/ResourceManagement/TextureManager.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvCore/ResourceManagement/TextureManager.h" diff --git a/Sources/Overload/OvCore/src/OvCore/Resources/Loaders/MaterialLoader.cpp b/Sources/Overload/OvCore/src/OvCore/Resources/Loaders/MaterialLoader.cpp index e05e1d16..2ccca4e4 100644 --- a/Sources/Overload/OvCore/src/OvCore/Resources/Loaders/MaterialLoader.cpp +++ b/Sources/Overload/OvCore/src/OvCore/Resources/Loaders/MaterialLoader.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvCore/Resources/Loaders/MaterialLoader.h" diff --git a/Sources/Overload/OvCore/src/OvCore/Resources/Material.cpp b/Sources/Overload/OvCore/src/OvCore/Resources/Material.cpp index 8393c955..e1f69d3f 100644 --- a/Sources/Overload/OvCore/src/OvCore/Resources/Material.cpp +++ b/Sources/Overload/OvCore/src/OvCore/Resources/Material.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvCore/Resources/Material.h" diff --git a/Sources/Overload/OvCore/src/OvCore/SceneSystem/Scene.cpp b/Sources/Overload/OvCore/src/OvCore/SceneSystem/Scene.cpp index ada5a6d7..07e6eae5 100644 --- a/Sources/Overload/OvCore/src/OvCore/SceneSystem/Scene.cpp +++ b/Sources/Overload/OvCore/src/OvCore/SceneSystem/Scene.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvCore/src/OvCore/SceneSystem/SceneManager.cpp b/Sources/Overload/OvCore/src/OvCore/SceneSystem/SceneManager.cpp index a3582f96..f2a0cc1e 100644 --- a/Sources/Overload/OvCore/src/OvCore/SceneSystem/SceneManager.cpp +++ b/Sources/Overload/OvCore/src/OvCore/SceneSystem/SceneManager.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvCore/src/OvCore/Scripting/LuaActorBinder.cpp b/Sources/Overload/OvCore/src/OvCore/Scripting/LuaActorBinder.cpp index 6bc8ef4f..2b58b188 100644 --- a/Sources/Overload/OvCore/src/OvCore/Scripting/LuaActorBinder.cpp +++ b/Sources/Overload/OvCore/src/OvCore/Scripting/LuaActorBinder.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvCore/Scripting/LuaActorBinder.h" diff --git a/Sources/Overload/OvCore/src/OvCore/Scripting/LuaBinder.cpp b/Sources/Overload/OvCore/src/OvCore/Scripting/LuaBinder.cpp index c6b5516d..ff451389 100644 --- a/Sources/Overload/OvCore/src/OvCore/Scripting/LuaBinder.cpp +++ b/Sources/Overload/OvCore/src/OvCore/Scripting/LuaBinder.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvCore/Scripting/LuaBinder.h" diff --git a/Sources/Overload/OvCore/src/OvCore/Scripting/LuaComponentBinder.cpp b/Sources/Overload/OvCore/src/OvCore/Scripting/LuaComponentBinder.cpp index 33f6bcc9..e837b935 100644 --- a/Sources/Overload/OvCore/src/OvCore/Scripting/LuaComponentBinder.cpp +++ b/Sources/Overload/OvCore/src/OvCore/Scripting/LuaComponentBinder.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvCore/Scripting/LuaComponentBinder.h" diff --git a/Sources/Overload/OvCore/src/OvCore/Scripting/LuaGlobalsBinder.cpp b/Sources/Overload/OvCore/src/OvCore/Scripting/LuaGlobalsBinder.cpp index 5f2d5998..e31eb103 100644 --- a/Sources/Overload/OvCore/src/OvCore/Scripting/LuaGlobalsBinder.cpp +++ b/Sources/Overload/OvCore/src/OvCore/Scripting/LuaGlobalsBinder.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvCore/Scripting/LuaGlobalsBinder.h" diff --git a/Sources/Overload/OvCore/src/OvCore/Scripting/LuaMathsBinder.cpp b/Sources/Overload/OvCore/src/OvCore/Scripting/LuaMathsBinder.cpp index 372baa4e..36d09104 100644 --- a/Sources/Overload/OvCore/src/OvCore/Scripting/LuaMathsBinder.cpp +++ b/Sources/Overload/OvCore/src/OvCore/Scripting/LuaMathsBinder.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvCore/Scripting/LuaMathsBinder.h" diff --git a/Sources/Overload/OvCore/src/OvCore/Scripting/ScriptInterpreter.cpp b/Sources/Overload/OvCore/src/OvCore/Scripting/ScriptInterpreter.cpp index 807b8987..d38a0383 100644 --- a/Sources/Overload/OvCore/src/OvCore/Scripting/ScriptInterpreter.cpp +++ b/Sources/Overload/OvCore/src/OvCore/Scripting/ScriptInterpreter.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvDebug/include/OvDebug/API/Export.h b/Sources/Overload/OvDebug/include/OvDebug/API/Export.h index c773d363..366f8eeb 100644 --- a/Sources/Overload/OvDebug/include/OvDebug/API/Export.h +++ b/Sources/Overload/OvDebug/include/OvDebug/API/Export.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvDebug/include/OvDebug/Utils/Assertion.h b/Sources/Overload/OvDebug/include/OvDebug/Utils/Assertion.h index 2c54b42e..99b3909c 100644 --- a/Sources/Overload/OvDebug/include/OvDebug/Utils/Assertion.h +++ b/Sources/Overload/OvDebug/include/OvDebug/Utils/Assertion.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvDebug/include/OvDebug/Utils/ConsoleColor.h b/Sources/Overload/OvDebug/include/OvDebug/Utils/ConsoleColor.h index 731c8a33..1b3f4167 100644 --- a/Sources/Overload/OvDebug/include/OvDebug/Utils/ConsoleColor.h +++ b/Sources/Overload/OvDebug/include/OvDebug/Utils/ConsoleColor.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvDebug/include/OvDebug/Utils/ConsoleHandler.h b/Sources/Overload/OvDebug/include/OvDebug/Utils/ConsoleHandler.h index bd79d0a8..6c2405cd 100644 --- a/Sources/Overload/OvDebug/include/OvDebug/Utils/ConsoleHandler.h +++ b/Sources/Overload/OvDebug/include/OvDebug/Utils/ConsoleHandler.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvDebug/include/OvDebug/Utils/FileHandler.h b/Sources/Overload/OvDebug/include/OvDebug/Utils/FileHandler.h index f8759bea..4b5383b5 100644 --- a/Sources/Overload/OvDebug/include/OvDebug/Utils/FileHandler.h +++ b/Sources/Overload/OvDebug/include/OvDebug/Utils/FileHandler.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvDebug/include/OvDebug/Utils/HistoryHandler.h b/Sources/Overload/OvDebug/include/OvDebug/Utils/HistoryHandler.h index 40f09522..99e1c0ab 100644 --- a/Sources/Overload/OvDebug/include/OvDebug/Utils/HistoryHandler.h +++ b/Sources/Overload/OvDebug/include/OvDebug/Utils/HistoryHandler.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvDebug/include/OvDebug/Utils/ILogHandler.h b/Sources/Overload/OvDebug/include/OvDebug/Utils/ILogHandler.h index 6b943da3..501b8e0f 100644 --- a/Sources/Overload/OvDebug/include/OvDebug/Utils/ILogHandler.h +++ b/Sources/Overload/OvDebug/include/OvDebug/Utils/ILogHandler.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvDebug/include/OvDebug/Utils/Logger.h b/Sources/Overload/OvDebug/include/OvDebug/Utils/Logger.h index 6c11aa8d..185a8b32 100644 --- a/Sources/Overload/OvDebug/include/OvDebug/Utils/Logger.h +++ b/Sources/Overload/OvDebug/include/OvDebug/Utils/Logger.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvDebug/include/OvDebug/Utils/Logger.inl b/Sources/Overload/OvDebug/include/OvDebug/Utils/Logger.inl index d0263d11..7170256c 100644 --- a/Sources/Overload/OvDebug/include/OvDebug/Utils/Logger.inl +++ b/Sources/Overload/OvDebug/include/OvDebug/Utils/Logger.inl @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvDebug/src/OvDebug/Utils/Assertion.cpp b/Sources/Overload/OvDebug/src/OvDebug/Utils/Assertion.cpp index 5f732af5..631f443f 100644 --- a/Sources/Overload/OvDebug/src/OvDebug/Utils/Assertion.cpp +++ b/Sources/Overload/OvDebug/src/OvDebug/Utils/Assertion.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvDebug/Utils/Assertion.h" diff --git a/Sources/Overload/OvDebug/src/OvDebug/Utils/ConsoleHandler.cpp b/Sources/Overload/OvDebug/src/OvDebug/Utils/ConsoleHandler.cpp index 8d8c9748..2ce6dfeb 100644 --- a/Sources/Overload/OvDebug/src/OvDebug/Utils/ConsoleHandler.cpp +++ b/Sources/Overload/OvDebug/src/OvDebug/Utils/ConsoleHandler.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvDebug/Utils/ConsoleHandler.h" diff --git a/Sources/Overload/OvDebug/src/OvDebug/Utils/FileHandler.cpp b/Sources/Overload/OvDebug/src/OvDebug/Utils/FileHandler.cpp index 8038d83f..b654dd27 100644 --- a/Sources/Overload/OvDebug/src/OvDebug/Utils/FileHandler.cpp +++ b/Sources/Overload/OvDebug/src/OvDebug/Utils/FileHandler.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #define _CRT_SECURE_NO_WARNINGS // Enable getenv diff --git a/Sources/Overload/OvDebug/src/OvDebug/Utils/HistoryHandler.cpp b/Sources/Overload/OvDebug/src/OvDebug/Utils/HistoryHandler.cpp index 28bac8d4..454a7fd0 100644 --- a/Sources/Overload/OvDebug/src/OvDebug/Utils/HistoryHandler.cpp +++ b/Sources/Overload/OvDebug/src/OvDebug/Utils/HistoryHandler.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvDebug/Utils/HistoryHandler.h" diff --git a/Sources/Overload/OvDebug/src/OvDebug/Utils/Logger.cpp b/Sources/Overload/OvDebug/src/OvDebug/Utils/Logger.cpp index c68a5e81..06812bbe 100644 --- a/Sources/Overload/OvDebug/src/OvDebug/Utils/Logger.cpp +++ b/Sources/Overload/OvDebug/src/OvDebug/Utils/Logger.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvDebug/Utils/Logger.h" diff --git a/Sources/Overload/OvEditor/include/OvEditor/Core/Application.h b/Sources/Overload/OvEditor/include/OvEditor/Core/Application.h index 6e94efa8..841b9c0f 100644 --- a/Sources/Overload/OvEditor/include/OvEditor/Core/Application.h +++ b/Sources/Overload/OvEditor/include/OvEditor/Core/Application.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvEditor/include/OvEditor/Core/CameraController.h b/Sources/Overload/OvEditor/include/OvEditor/Core/CameraController.h index 90232798..2e86e333 100644 --- a/Sources/Overload/OvEditor/include/OvEditor/Core/CameraController.h +++ b/Sources/Overload/OvEditor/include/OvEditor/Core/CameraController.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvEditor/include/OvEditor/Core/Context.h b/Sources/Overload/OvEditor/include/OvEditor/Core/Context.h index de00ba5b..83460d73 100644 --- a/Sources/Overload/OvEditor/include/OvEditor/Core/Context.h +++ b/Sources/Overload/OvEditor/include/OvEditor/Core/Context.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvEditor/include/OvEditor/Core/Editor.h b/Sources/Overload/OvEditor/include/OvEditor/Core/Editor.h index 5ccda66a..860ee097 100644 --- a/Sources/Overload/OvEditor/include/OvEditor/Core/Editor.h +++ b/Sources/Overload/OvEditor/include/OvEditor/Core/Editor.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvEditor/include/OvEditor/Core/EditorActions.h b/Sources/Overload/OvEditor/include/OvEditor/Core/EditorActions.h index 7dcdc16e..f5f1ed94 100644 --- a/Sources/Overload/OvEditor/include/OvEditor/Core/EditorActions.h +++ b/Sources/Overload/OvEditor/include/OvEditor/Core/EditorActions.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvEditor/include/OvEditor/Core/EditorActions.inl b/Sources/Overload/OvEditor/include/OvEditor/Core/EditorActions.inl index 20d9a9ac..7b68eee0 100644 --- a/Sources/Overload/OvEditor/include/OvEditor/Core/EditorActions.inl +++ b/Sources/Overload/OvEditor/include/OvEditor/Core/EditorActions.inl @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvEditor/include/OvEditor/Core/EditorRenderer.h b/Sources/Overload/OvEditor/include/OvEditor/Core/EditorRenderer.h index fb290b69..1c771d73 100644 --- a/Sources/Overload/OvEditor/include/OvEditor/Core/EditorRenderer.h +++ b/Sources/Overload/OvEditor/include/OvEditor/Core/EditorRenderer.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvEditor/include/OvEditor/Core/EditorResources.h b/Sources/Overload/OvEditor/include/OvEditor/Core/EditorResources.h index 07b4b918..feaecc73 100644 --- a/Sources/Overload/OvEditor/include/OvEditor/Core/EditorResources.h +++ b/Sources/Overload/OvEditor/include/OvEditor/Core/EditorResources.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvEditor/include/OvEditor/Core/GizmoBehaviour.h b/Sources/Overload/OvEditor/include/OvEditor/Core/GizmoBehaviour.h index 6f0ea66c..b8364f29 100644 --- a/Sources/Overload/OvEditor/include/OvEditor/Core/GizmoBehaviour.h +++ b/Sources/Overload/OvEditor/include/OvEditor/Core/GizmoBehaviour.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvEditor/include/OvEditor/Core/PanelsManager.h b/Sources/Overload/OvEditor/include/OvEditor/Core/PanelsManager.h index 965d2a6e..e8038a59 100644 --- a/Sources/Overload/OvEditor/include/OvEditor/Core/PanelsManager.h +++ b/Sources/Overload/OvEditor/include/OvEditor/Core/PanelsManager.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvEditor/include/OvEditor/Core/ProjectHub.h b/Sources/Overload/OvEditor/include/OvEditor/Core/ProjectHub.h index 741f73dd..1adfeea3 100644 --- a/Sources/Overload/OvEditor/include/OvEditor/Core/ProjectHub.h +++ b/Sources/Overload/OvEditor/include/OvEditor/Core/ProjectHub.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvEditor/include/OvEditor/Panels/AView.h b/Sources/Overload/OvEditor/include/OvEditor/Panels/AView.h index 6f13782b..30b6ed1a 100644 --- a/Sources/Overload/OvEditor/include/OvEditor/Panels/AView.h +++ b/Sources/Overload/OvEditor/include/OvEditor/Panels/AView.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvEditor/include/OvEditor/Panels/AViewControllable.h b/Sources/Overload/OvEditor/include/OvEditor/Panels/AViewControllable.h index effc4cfa..1516e2fc 100644 --- a/Sources/Overload/OvEditor/include/OvEditor/Panels/AViewControllable.h +++ b/Sources/Overload/OvEditor/include/OvEditor/Panels/AViewControllable.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvEditor/include/OvEditor/Panels/AssetBrowser.h b/Sources/Overload/OvEditor/include/OvEditor/Panels/AssetBrowser.h index 80ef6eda..2787f780 100644 --- a/Sources/Overload/OvEditor/include/OvEditor/Panels/AssetBrowser.h +++ b/Sources/Overload/OvEditor/include/OvEditor/Panels/AssetBrowser.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvEditor/include/OvEditor/Panels/AssetView.h b/Sources/Overload/OvEditor/include/OvEditor/Panels/AssetView.h index d48fd3e5..36a93d22 100644 --- a/Sources/Overload/OvEditor/include/OvEditor/Panels/AssetView.h +++ b/Sources/Overload/OvEditor/include/OvEditor/Panels/AssetView.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvEditor/include/OvEditor/Panels/Console.h b/Sources/Overload/OvEditor/include/OvEditor/Panels/Console.h index 11ab5ce4..e72f6d31 100644 --- a/Sources/Overload/OvEditor/include/OvEditor/Panels/Console.h +++ b/Sources/Overload/OvEditor/include/OvEditor/Panels/Console.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvEditor/include/OvEditor/Panels/GameView.h b/Sources/Overload/OvEditor/include/OvEditor/Panels/GameView.h index bc79b8b2..bab03c5b 100644 --- a/Sources/Overload/OvEditor/include/OvEditor/Panels/GameView.h +++ b/Sources/Overload/OvEditor/include/OvEditor/Panels/GameView.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvEditor/include/OvEditor/Panels/HardwareInfo.h b/Sources/Overload/OvEditor/include/OvEditor/Panels/HardwareInfo.h index 7a892d69..12cd0947 100644 --- a/Sources/Overload/OvEditor/include/OvEditor/Panels/HardwareInfo.h +++ b/Sources/Overload/OvEditor/include/OvEditor/Panels/HardwareInfo.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvEditor/include/OvEditor/Panels/HelpWindow.h b/Sources/Overload/OvEditor/include/OvEditor/Panels/HelpWindow.h index 26bf44d4..39e42589 100644 --- a/Sources/Overload/OvEditor/include/OvEditor/Panels/HelpWindow.h +++ b/Sources/Overload/OvEditor/include/OvEditor/Panels/HelpWindow.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvEditor/include/OvEditor/Panels/Hierarchy.h b/Sources/Overload/OvEditor/include/OvEditor/Panels/Hierarchy.h index aeb0c1f2..b7f5ea75 100644 --- a/Sources/Overload/OvEditor/include/OvEditor/Panels/Hierarchy.h +++ b/Sources/Overload/OvEditor/include/OvEditor/Panels/Hierarchy.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvEditor/include/OvEditor/Panels/Inspector.h b/Sources/Overload/OvEditor/include/OvEditor/Panels/Inspector.h index 71977c14..2ee113e8 100644 --- a/Sources/Overload/OvEditor/include/OvEditor/Panels/Inspector.h +++ b/Sources/Overload/OvEditor/include/OvEditor/Panels/Inspector.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvEditor/include/OvEditor/Panels/MaterialEditor.h b/Sources/Overload/OvEditor/include/OvEditor/Panels/MaterialEditor.h index 53fdb8f2..1b1fd0ce 100644 --- a/Sources/Overload/OvEditor/include/OvEditor/Panels/MaterialEditor.h +++ b/Sources/Overload/OvEditor/include/OvEditor/Panels/MaterialEditor.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvEditor/include/OvEditor/Panels/MenuBar.h b/Sources/Overload/OvEditor/include/OvEditor/Panels/MenuBar.h index 05c25c8e..ddd76f7a 100644 --- a/Sources/Overload/OvEditor/include/OvEditor/Panels/MenuBar.h +++ b/Sources/Overload/OvEditor/include/OvEditor/Panels/MenuBar.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvEditor/include/OvEditor/Panels/Profiler.h b/Sources/Overload/OvEditor/include/OvEditor/Panels/Profiler.h index 04022ff6..f49487b7 100644 --- a/Sources/Overload/OvEditor/include/OvEditor/Panels/Profiler.h +++ b/Sources/Overload/OvEditor/include/OvEditor/Panels/Profiler.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvEditor/include/OvEditor/Panels/ProjectSettings.h b/Sources/Overload/OvEditor/include/OvEditor/Panels/ProjectSettings.h index 4de7c1e3..9e229d9b 100644 --- a/Sources/Overload/OvEditor/include/OvEditor/Panels/ProjectSettings.h +++ b/Sources/Overload/OvEditor/include/OvEditor/Panels/ProjectSettings.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvEditor/include/OvEditor/Panels/SceneView.h b/Sources/Overload/OvEditor/include/OvEditor/Panels/SceneView.h index 0e1248ad..a5cc74d3 100644 --- a/Sources/Overload/OvEditor/include/OvEditor/Panels/SceneView.h +++ b/Sources/Overload/OvEditor/include/OvEditor/Panels/SceneView.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvEditor/include/OvEditor/Panels/Toolbar.h b/Sources/Overload/OvEditor/include/OvEditor/Panels/Toolbar.h index b19dd3b7..b6456c47 100644 --- a/Sources/Overload/OvEditor/include/OvEditor/Panels/Toolbar.h +++ b/Sources/Overload/OvEditor/include/OvEditor/Panels/Toolbar.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvEditor/include/OvEditor/Resources/RawShaders.h b/Sources/Overload/OvEditor/include/OvEditor/Resources/RawShaders.h index 1a4bf212..3451d194 100644 --- a/Sources/Overload/OvEditor/include/OvEditor/Resources/RawShaders.h +++ b/Sources/Overload/OvEditor/include/OvEditor/Resources/RawShaders.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvEditor/include/OvEditor/Resources/RawTextures.h b/Sources/Overload/OvEditor/include/OvEditor/Resources/RawTextures.h index 75bb46d1..65b4a782 100644 --- a/Sources/Overload/OvEditor/include/OvEditor/Resources/RawTextures.h +++ b/Sources/Overload/OvEditor/include/OvEditor/Resources/RawTextures.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvEditor/include/OvEditor/Settings/EditorSettings.h b/Sources/Overload/OvEditor/include/OvEditor/Settings/EditorSettings.h index ef87123d..50c010f9 100644 --- a/Sources/Overload/OvEditor/include/OvEditor/Settings/EditorSettings.h +++ b/Sources/Overload/OvEditor/include/OvEditor/Settings/EditorSettings.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvEditor/src/OvEditor/Core/CameraController.cpp b/Sources/Overload/OvEditor/src/OvEditor/Core/CameraController.cpp index 510a2d7e..78a37444 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Core/CameraController.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Core/CameraController.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvEditor/Core/EditorActions.h" diff --git a/Sources/Overload/OvEditor/src/OvEditor/Core/Context.cpp b/Sources/Overload/OvEditor/src/OvEditor/Core/Context.cpp index 8986ffac..37635584 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Core/Context.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Core/Context.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvEditor/src/OvEditor/Core/Editor.cpp b/Sources/Overload/OvEditor/src/OvEditor/Core/Editor.cpp index 950ffce7..cb509faf 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Core/Editor.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Core/Editor.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvEditor/src/OvEditor/Core/EditorActions.cpp b/Sources/Overload/OvEditor/src/OvEditor/Core/EditorActions.cpp index b62e9b8f..1afa93b1 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Core/EditorActions.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Core/EditorActions.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvEditor/src/OvEditor/Core/EditorRenderer.cpp b/Sources/Overload/OvEditor/src/OvEditor/Core/EditorRenderer.cpp index 49ce2b78..64af3162 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Core/EditorRenderer.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Core/EditorRenderer.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvEditor/src/OvEditor/Core/EditorResources.cpp b/Sources/Overload/OvEditor/src/OvEditor/Core/EditorResources.cpp index 9a3e62c0..884c0271 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Core/EditorResources.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Core/EditorResources.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvEditor/src/OvEditor/Core/GizmoBehaviour.cpp b/Sources/Overload/OvEditor/src/OvEditor/Core/GizmoBehaviour.cpp index 48e4ae16..c73d79ed 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Core/GizmoBehaviour.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Core/GizmoBehaviour.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvEditor/Core/GizmoBehaviour.h" diff --git a/Sources/Overload/OvEditor/src/OvEditor/Core/PanelsManager.cpp b/Sources/Overload/OvEditor/src/OvEditor/Core/PanelsManager.cpp index 1e30d005..56c6ce21 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Core/PanelsManager.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Core/PanelsManager.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvEditor/Core/PanelsManager.h" diff --git a/Sources/Overload/OvEditor/src/OvEditor/Core/ProjectHub.cpp b/Sources/Overload/OvEditor/src/OvEditor/Core/ProjectHub.cpp index 16d6df04..672fda9d 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Core/ProjectHub.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Core/ProjectHub.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #define _CRT_SECURE_NO_WARNINGS diff --git a/Sources/Overload/OvEditor/src/OvEditor/Main.cpp b/Sources/Overload/OvEditor/src/OvEditor/Main.cpp index af0be930..22b6f633 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Main.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Main.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvEditor/src/OvEditor/Panels/AView.cpp b/Sources/Overload/OvEditor/src/OvEditor/Panels/AView.cpp index 6b61a86d..1cda131c 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Panels/AView.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Panels/AView.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvEditor/src/OvEditor/Panels/AViewControllable.cpp b/Sources/Overload/OvEditor/src/OvEditor/Panels/AViewControllable.cpp index a6959b88..61804342 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Panels/AViewControllable.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Panels/AViewControllable.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvEditor/Panels/AViewControllable.h" diff --git a/Sources/Overload/OvEditor/src/OvEditor/Panels/AssetBrowser.cpp b/Sources/Overload/OvEditor/src/OvEditor/Panels/AssetBrowser.cpp index 15d9d12b..90b4fd00 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Panels/AssetBrowser.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Panels/AssetBrowser.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvEditor/src/OvEditor/Panels/AssetView.cpp b/Sources/Overload/OvEditor/src/OvEditor/Panels/AssetView.cpp index 1e6b995f..f12b5e3a 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Panels/AssetView.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Panels/AssetView.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvEditor/src/OvEditor/Panels/Console.cpp b/Sources/Overload/OvEditor/src/OvEditor/Panels/Console.cpp index c5d71fb0..5314e294 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Panels/Console.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Panels/Console.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvEditor/src/OvEditor/Panels/GameView.cpp b/Sources/Overload/OvEditor/src/OvEditor/Panels/GameView.cpp index fe06ba57..2256b069 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Panels/GameView.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Panels/GameView.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvEditor/src/OvEditor/Panels/HardwareInfo.cpp b/Sources/Overload/OvEditor/src/OvEditor/Panels/HardwareInfo.cpp index e71e6eaf..b895b865 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Panels/HardwareInfo.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Panels/HardwareInfo.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvEditor/Panels/HardwareInfo.h" diff --git a/Sources/Overload/OvEditor/src/OvEditor/Panels/HelpWindow.cpp b/Sources/Overload/OvEditor/src/OvEditor/Panels/HelpWindow.cpp index 8d81195a..e43a019f 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Panels/HelpWindow.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Panels/HelpWindow.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvEditor/Panels/HelpWindow.h" diff --git a/Sources/Overload/OvEditor/src/OvEditor/Panels/Hierarchy.cpp b/Sources/Overload/OvEditor/src/OvEditor/Panels/Hierarchy.cpp index 80533cff..f350b5ed 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Panels/Hierarchy.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Panels/Hierarchy.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvEditor/Panels/Hierarchy.h" diff --git a/Sources/Overload/OvEditor/src/OvEditor/Panels/Inspector.cpp b/Sources/Overload/OvEditor/src/OvEditor/Panels/Inspector.cpp index 4fa6922d..2fce414a 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Panels/Inspector.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Panels/Inspector.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvEditor/src/OvEditor/Panels/MaterialEditor.cpp b/Sources/Overload/OvEditor/src/OvEditor/Panels/MaterialEditor.cpp index 2a9e4091..6586f781 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Panels/MaterialEditor.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Panels/MaterialEditor.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvEditor/Panels/MaterialEditor.h" diff --git a/Sources/Overload/OvEditor/src/OvEditor/Panels/MenuBar.cpp b/Sources/Overload/OvEditor/src/OvEditor/Panels/MenuBar.cpp index b954c7b0..f96a26c9 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Panels/MenuBar.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Panels/MenuBar.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvEditor/src/OvEditor/Panels/Profiler.cpp b/Sources/Overload/OvEditor/src/OvEditor/Panels/Profiler.cpp index 1b8786c0..22baf3fd 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Panels/Profiler.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Panels/Profiler.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvEditor/Panels/Profiler.h" diff --git a/Sources/Overload/OvEditor/src/OvEditor/Panels/ProjectSettings.cpp b/Sources/Overload/OvEditor/src/OvEditor/Panels/ProjectSettings.cpp index d6c61f06..0f63f080 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Panels/ProjectSettings.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Panels/ProjectSettings.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvEditor/Panels/ProjectSettings.h" diff --git a/Sources/Overload/OvEditor/src/OvEditor/Panels/SceneView.cpp b/Sources/Overload/OvEditor/src/OvEditor/Panels/SceneView.cpp index 738c9cec..b65f883f 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Panels/SceneView.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Panels/SceneView.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvEditor/src/OvEditor/Panels/Toolbar.cpp b/Sources/Overload/OvEditor/src/OvEditor/Panels/Toolbar.cpp index 23871f0f..3fc0ba6e 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Panels/Toolbar.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Panels/Toolbar.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvEditor/src/OvEditor/Resources/RawShaders.cpp b/Sources/Overload/OvEditor/src/OvEditor/Resources/RawShaders.cpp index caa31521..c6df3e78 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Resources/RawShaders.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Resources/RawShaders.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvEditor/Resources/RawShaders.h" diff --git a/Sources/Overload/OvEditor/src/OvEditor/Settings/EditorSettings.cpp b/Sources/Overload/OvEditor/src/OvEditor/Settings/EditorSettings.cpp index 3d6e6e0d..1895e2c7 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Settings/EditorSettings.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Settings/EditorSettings.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvEditor/Settings/EditorSettings.h" \ No newline at end of file diff --git a/Sources/Overload/OvGame/include/OvGame/Core/Application.h b/Sources/Overload/OvGame/include/OvGame/Core/Application.h index 12d592c0..d329d588 100644 --- a/Sources/Overload/OvGame/include/OvGame/Core/Application.h +++ b/Sources/Overload/OvGame/include/OvGame/Core/Application.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvGame/include/OvGame/Core/Context.h b/Sources/Overload/OvGame/include/OvGame/Core/Context.h index 60355b61..32c44106 100644 --- a/Sources/Overload/OvGame/include/OvGame/Core/Context.h +++ b/Sources/Overload/OvGame/include/OvGame/Core/Context.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvGame/include/OvGame/Core/Game.h b/Sources/Overload/OvGame/include/OvGame/Core/Game.h index 0dc5c428..7af77a92 100644 --- a/Sources/Overload/OvGame/include/OvGame/Core/Game.h +++ b/Sources/Overload/OvGame/include/OvGame/Core/Game.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvGame/include/OvGame/Core/GameRenderer.h b/Sources/Overload/OvGame/include/OvGame/Core/GameRenderer.h index 019f75ee..4ffba65e 100644 --- a/Sources/Overload/OvGame/include/OvGame/Core/GameRenderer.h +++ b/Sources/Overload/OvGame/include/OvGame/Core/GameRenderer.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvGame/include/OvGame/Debug/DriverInfo.h b/Sources/Overload/OvGame/include/OvGame/Debug/DriverInfo.h index 34be8f27..1e911f88 100644 --- a/Sources/Overload/OvGame/include/OvGame/Debug/DriverInfo.h +++ b/Sources/Overload/OvGame/include/OvGame/Debug/DriverInfo.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvGame/include/OvGame/Debug/FrameInfo.h b/Sources/Overload/OvGame/include/OvGame/Debug/FrameInfo.h index 9a8cf07b..67659cdf 100644 --- a/Sources/Overload/OvGame/include/OvGame/Debug/FrameInfo.h +++ b/Sources/Overload/OvGame/include/OvGame/Debug/FrameInfo.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvGame/include/OvGame/Debug/GameProfiler.h b/Sources/Overload/OvGame/include/OvGame/Debug/GameProfiler.h index 1ed46613..46c709a6 100644 --- a/Sources/Overload/OvGame/include/OvGame/Debug/GameProfiler.h +++ b/Sources/Overload/OvGame/include/OvGame/Debug/GameProfiler.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvGame/include/OvGame/Utils/FPSCounter.h b/Sources/Overload/OvGame/include/OvGame/Utils/FPSCounter.h index 419c01fc..831450fd 100644 --- a/Sources/Overload/OvGame/include/OvGame/Utils/FPSCounter.h +++ b/Sources/Overload/OvGame/include/OvGame/Utils/FPSCounter.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvGame/src/OvGame/Core/Application.cpp b/Sources/Overload/OvGame/src/OvGame/Core/Application.cpp index f9509834..ea4a6a7c 100644 --- a/Sources/Overload/OvGame/src/OvGame/Core/Application.cpp +++ b/Sources/Overload/OvGame/src/OvGame/Core/Application.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvGame/src/OvGame/Core/Context.cpp b/Sources/Overload/OvGame/src/OvGame/Core/Context.cpp index d320b7d7..8134c604 100644 --- a/Sources/Overload/OvGame/src/OvGame/Core/Context.cpp +++ b/Sources/Overload/OvGame/src/OvGame/Core/Context.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvGame/src/OvGame/Core/Game.cpp b/Sources/Overload/OvGame/src/OvGame/Core/Game.cpp index f11bb319..ad09f91e 100644 --- a/Sources/Overload/OvGame/src/OvGame/Core/Game.cpp +++ b/Sources/Overload/OvGame/src/OvGame/Core/Game.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvGame/Core/Game.h" diff --git a/Sources/Overload/OvGame/src/OvGame/Core/GameRenderer.cpp b/Sources/Overload/OvGame/src/OvGame/Core/GameRenderer.cpp index 7d85b04f..706ccfc9 100644 --- a/Sources/Overload/OvGame/src/OvGame/Core/GameRenderer.cpp +++ b/Sources/Overload/OvGame/src/OvGame/Core/GameRenderer.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvGame/Core/GameRenderer.h" diff --git a/Sources/Overload/OvGame/src/OvGame/Debug/DriverInfo.cpp b/Sources/Overload/OvGame/src/OvGame/Debug/DriverInfo.cpp index 2e29745d..4e7bf0c1 100644 --- a/Sources/Overload/OvGame/src/OvGame/Debug/DriverInfo.cpp +++ b/Sources/Overload/OvGame/src/OvGame/Debug/DriverInfo.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #ifdef _DEBUG diff --git a/Sources/Overload/OvGame/src/OvGame/Debug/FrameInfo.cpp b/Sources/Overload/OvGame/src/OvGame/Debug/FrameInfo.cpp index 26acd929..0164aa2b 100644 --- a/Sources/Overload/OvGame/src/OvGame/Debug/FrameInfo.cpp +++ b/Sources/Overload/OvGame/src/OvGame/Debug/FrameInfo.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #ifdef _DEBUG diff --git a/Sources/Overload/OvGame/src/OvGame/Debug/GameProfiler.cpp b/Sources/Overload/OvGame/src/OvGame/Debug/GameProfiler.cpp index f8ede753..889a5e05 100644 --- a/Sources/Overload/OvGame/src/OvGame/Debug/GameProfiler.cpp +++ b/Sources/Overload/OvGame/src/OvGame/Debug/GameProfiler.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #ifdef _DEBUG diff --git a/Sources/Overload/OvGame/src/OvGame/Main.cpp b/Sources/Overload/OvGame/src/OvGame/Main.cpp index 391af962..3af8e4ba 100644 --- a/Sources/Overload/OvGame/src/OvGame/Main.cpp +++ b/Sources/Overload/OvGame/src/OvGame/Main.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvGame/Core/Application.h" diff --git a/Sources/Overload/OvGame/src/OvGame/Utils/FPSCounter.cpp b/Sources/Overload/OvGame/src/OvGame/Utils/FPSCounter.cpp index 96e8866e..44ef16ab 100644 --- a/Sources/Overload/OvGame/src/OvGame/Utils/FPSCounter.cpp +++ b/Sources/Overload/OvGame/src/OvGame/Utils/FPSCounter.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvGame/Utils/FPSCounter.h" diff --git a/Sources/Overload/OvMaths/include/OvMaths/API/Export.h b/Sources/Overload/OvMaths/include/OvMaths/API/Export.h index e7e09176..248ee3e7 100644 --- a/Sources/Overload/OvMaths/include/OvMaths/API/Export.h +++ b/Sources/Overload/OvMaths/include/OvMaths/API/Export.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvMaths/include/OvMaths/FMatrix3.h b/Sources/Overload/OvMaths/include/OvMaths/FMatrix3.h index f1c76cd7..68557393 100644 --- a/Sources/Overload/OvMaths/include/OvMaths/FMatrix3.h +++ b/Sources/Overload/OvMaths/include/OvMaths/FMatrix3.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvMaths/include/OvMaths/FMatrix4.h b/Sources/Overload/OvMaths/include/OvMaths/FMatrix4.h index 4cd366a1..f0af62dc 100644 --- a/Sources/Overload/OvMaths/include/OvMaths/FMatrix4.h +++ b/Sources/Overload/OvMaths/include/OvMaths/FMatrix4.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvMaths/include/OvMaths/FQuaternion.h b/Sources/Overload/OvMaths/include/OvMaths/FQuaternion.h index b3c373fd..2c840ff1 100644 --- a/Sources/Overload/OvMaths/include/OvMaths/FQuaternion.h +++ b/Sources/Overload/OvMaths/include/OvMaths/FQuaternion.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvMaths/include/OvMaths/FTransform.h b/Sources/Overload/OvMaths/include/OvMaths/FTransform.h index 33995f43..1cb2148d 100644 --- a/Sources/Overload/OvMaths/include/OvMaths/FTransform.h +++ b/Sources/Overload/OvMaths/include/OvMaths/FTransform.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvMaths/include/OvMaths/FVector2.h b/Sources/Overload/OvMaths/include/OvMaths/FVector2.h index f85fd0e7..4fab88b5 100644 --- a/Sources/Overload/OvMaths/include/OvMaths/FVector2.h +++ b/Sources/Overload/OvMaths/include/OvMaths/FVector2.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvMaths/include/OvMaths/FVector3.h b/Sources/Overload/OvMaths/include/OvMaths/FVector3.h index 1aa10c1c..f85a4f7d 100644 --- a/Sources/Overload/OvMaths/include/OvMaths/FVector3.h +++ b/Sources/Overload/OvMaths/include/OvMaths/FVector3.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvMaths/include/OvMaths/FVector4.h b/Sources/Overload/OvMaths/include/OvMaths/FVector4.h index 1b4fda78..2a7f24db 100644 --- a/Sources/Overload/OvMaths/include/OvMaths/FVector4.h +++ b/Sources/Overload/OvMaths/include/OvMaths/FVector4.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvMaths/include/OvMaths/Internal/TransformNotifier.h b/Sources/Overload/OvMaths/include/OvMaths/Internal/TransformNotifier.h index 7eefcbb7..633b30cb 100644 --- a/Sources/Overload/OvMaths/include/OvMaths/Internal/TransformNotifier.h +++ b/Sources/Overload/OvMaths/include/OvMaths/Internal/TransformNotifier.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvMaths/src/OvMaths/FMatrix3.cpp b/Sources/Overload/OvMaths/src/OvMaths/FMatrix3.cpp index 00939e9f..f18330f6 100644 --- a/Sources/Overload/OvMaths/src/OvMaths/FMatrix3.cpp +++ b/Sources/Overload/OvMaths/src/OvMaths/FMatrix3.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvMaths/src/OvMaths/FMatrix4.cpp b/Sources/Overload/OvMaths/src/OvMaths/FMatrix4.cpp index 1eaff630..88281f27 100644 --- a/Sources/Overload/OvMaths/src/OvMaths/FMatrix4.cpp +++ b/Sources/Overload/OvMaths/src/OvMaths/FMatrix4.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvMaths/src/OvMaths/FQuaternion.cpp b/Sources/Overload/OvMaths/src/OvMaths/FQuaternion.cpp index 8a610907..2d1a5fa0 100644 --- a/Sources/Overload/OvMaths/src/OvMaths/FQuaternion.cpp +++ b/Sources/Overload/OvMaths/src/OvMaths/FQuaternion.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvMaths/src/OvMaths/FTransform.cpp b/Sources/Overload/OvMaths/src/OvMaths/FTransform.cpp index 497fb1a5..51083713 100644 --- a/Sources/Overload/OvMaths/src/OvMaths/FTransform.cpp +++ b/Sources/Overload/OvMaths/src/OvMaths/FTransform.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvMaths/FTransform.h" diff --git a/Sources/Overload/OvMaths/src/OvMaths/FVector2.cpp b/Sources/Overload/OvMaths/src/OvMaths/FVector2.cpp index 67d67f9a..5aad0d38 100644 --- a/Sources/Overload/OvMaths/src/OvMaths/FVector2.cpp +++ b/Sources/Overload/OvMaths/src/OvMaths/FVector2.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvMaths/src/OvMaths/FVector3.cpp b/Sources/Overload/OvMaths/src/OvMaths/FVector3.cpp index f10698df..db35a921 100644 --- a/Sources/Overload/OvMaths/src/OvMaths/FVector3.cpp +++ b/Sources/Overload/OvMaths/src/OvMaths/FVector3.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvMaths/src/OvMaths/FVector4.cpp b/Sources/Overload/OvMaths/src/OvMaths/FVector4.cpp index 6db11bbb..05493ecd 100644 --- a/Sources/Overload/OvMaths/src/OvMaths/FVector4.cpp +++ b/Sources/Overload/OvMaths/src/OvMaths/FVector4.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvMaths/src/OvMaths/Internal/TransformNotifier.cpp b/Sources/Overload/OvMaths/src/OvMaths/Internal/TransformNotifier.cpp index 6b0fdc05..80b4a781 100644 --- a/Sources/Overload/OvMaths/src/OvMaths/Internal/TransformNotifier.cpp +++ b/Sources/Overload/OvMaths/src/OvMaths/Internal/TransformNotifier.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvMaths/Internal/TransformNotifier.h" diff --git a/Sources/Overload/OvPhysics/include/OvPhysics/API/Export.h b/Sources/Overload/OvPhysics/include/OvPhysics/API/Export.h index 7ba8253e..72472a1a 100644 --- a/Sources/Overload/OvPhysics/include/OvPhysics/API/Export.h +++ b/Sources/Overload/OvPhysics/include/OvPhysics/API/Export.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvPhysics/include/OvPhysics/Core/PhysicsEngine.h b/Sources/Overload/OvPhysics/include/OvPhysics/Core/PhysicsEngine.h index 7a90da3d..0a6274c9 100644 --- a/Sources/Overload/OvPhysics/include/OvPhysics/Core/PhysicsEngine.h +++ b/Sources/Overload/OvPhysics/include/OvPhysics/Core/PhysicsEngine.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvPhysics/include/OvPhysics/Entities/PhysicalBox.h b/Sources/Overload/OvPhysics/include/OvPhysics/Entities/PhysicalBox.h index 99349c81..f153250b 100644 --- a/Sources/Overload/OvPhysics/include/OvPhysics/Entities/PhysicalBox.h +++ b/Sources/Overload/OvPhysics/include/OvPhysics/Entities/PhysicalBox.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvPhysics/include/OvPhysics/Entities/PhysicalCapsule.h b/Sources/Overload/OvPhysics/include/OvPhysics/Entities/PhysicalCapsule.h index 403ba87e..199b3d84 100644 --- a/Sources/Overload/OvPhysics/include/OvPhysics/Entities/PhysicalCapsule.h +++ b/Sources/Overload/OvPhysics/include/OvPhysics/Entities/PhysicalCapsule.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvPhysics/include/OvPhysics/Entities/PhysicalObject.h b/Sources/Overload/OvPhysics/include/OvPhysics/Entities/PhysicalObject.h index b6266961..7e21a9a2 100644 --- a/Sources/Overload/OvPhysics/include/OvPhysics/Entities/PhysicalObject.h +++ b/Sources/Overload/OvPhysics/include/OvPhysics/Entities/PhysicalObject.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvPhysics/include/OvPhysics/Entities/PhysicalSphere.h b/Sources/Overload/OvPhysics/include/OvPhysics/Entities/PhysicalSphere.h index 269a871a..dd56f783 100644 --- a/Sources/Overload/OvPhysics/include/OvPhysics/Entities/PhysicalSphere.h +++ b/Sources/Overload/OvPhysics/include/OvPhysics/Entities/PhysicalSphere.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvPhysics/include/OvPhysics/Entities/RaycastHit.h b/Sources/Overload/OvPhysics/include/OvPhysics/Entities/RaycastHit.h index d7c37856..d3fc1d33 100644 --- a/Sources/Overload/OvPhysics/include/OvPhysics/Entities/RaycastHit.h +++ b/Sources/Overload/OvPhysics/include/OvPhysics/Entities/RaycastHit.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvPhysics/include/OvPhysics/Settings/BodySettings.h b/Sources/Overload/OvPhysics/include/OvPhysics/Settings/BodySettings.h index 2396e379..818af149 100644 --- a/Sources/Overload/OvPhysics/include/OvPhysics/Settings/BodySettings.h +++ b/Sources/Overload/OvPhysics/include/OvPhysics/Settings/BodySettings.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvPhysics/include/OvPhysics/Settings/PhysicsSettings.h b/Sources/Overload/OvPhysics/include/OvPhysics/Settings/PhysicsSettings.h index 9eef6d47..9f260764 100644 --- a/Sources/Overload/OvPhysics/include/OvPhysics/Settings/PhysicsSettings.h +++ b/Sources/Overload/OvPhysics/include/OvPhysics/Settings/PhysicsSettings.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvPhysics/include/OvPhysics/Tools/Conversion.h b/Sources/Overload/OvPhysics/include/OvPhysics/Tools/Conversion.h index d6102edb..8c258f27 100644 --- a/Sources/Overload/OvPhysics/include/OvPhysics/Tools/Conversion.h +++ b/Sources/Overload/OvPhysics/include/OvPhysics/Tools/Conversion.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvPhysics/src/OvPhysics/Core/PhysicsEngine.cpp b/Sources/Overload/OvPhysics/src/OvPhysics/Core/PhysicsEngine.cpp index 8a2b2dea..31d3af93 100644 --- a/Sources/Overload/OvPhysics/src/OvPhysics/Core/PhysicsEngine.cpp +++ b/Sources/Overload/OvPhysics/src/OvPhysics/Core/PhysicsEngine.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvPhysics/src/OvPhysics/Entities/PhysicalBox.cpp b/Sources/Overload/OvPhysics/src/OvPhysics/Entities/PhysicalBox.cpp index 5a016b0f..d6cb25e3 100644 --- a/Sources/Overload/OvPhysics/src/OvPhysics/Entities/PhysicalBox.cpp +++ b/Sources/Overload/OvPhysics/src/OvPhysics/Entities/PhysicalBox.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvPhysics/Entities/PhysicalBox.h" diff --git a/Sources/Overload/OvPhysics/src/OvPhysics/Entities/PhysicalCapsule.cpp b/Sources/Overload/OvPhysics/src/OvPhysics/Entities/PhysicalCapsule.cpp index 0e4dadd9..594ec362 100644 --- a/Sources/Overload/OvPhysics/src/OvPhysics/Entities/PhysicalCapsule.cpp +++ b/Sources/Overload/OvPhysics/src/OvPhysics/Entities/PhysicalCapsule.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvPhysics/src/OvPhysics/Entities/PhysicalObject.cpp b/Sources/Overload/OvPhysics/src/OvPhysics/Entities/PhysicalObject.cpp index 9bec32fc..0309e2a0 100644 --- a/Sources/Overload/OvPhysics/src/OvPhysics/Entities/PhysicalObject.cpp +++ b/Sources/Overload/OvPhysics/src/OvPhysics/Entities/PhysicalObject.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvPhysics/Entities/PhysicalObject.h" diff --git a/Sources/Overload/OvPhysics/src/OvPhysics/Entities/PhysicalSphere.cpp b/Sources/Overload/OvPhysics/src/OvPhysics/Entities/PhysicalSphere.cpp index 9bd28c38..57d7ddb7 100644 --- a/Sources/Overload/OvPhysics/src/OvPhysics/Entities/PhysicalSphere.cpp +++ b/Sources/Overload/OvPhysics/src/OvPhysics/Entities/PhysicalSphere.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvPhysics/src/OvPhysics/Tools/Conversion.cpp b/Sources/Overload/OvPhysics/src/OvPhysics/Tools/Conversion.cpp index b7853f22..9f710499 100644 --- a/Sources/Overload/OvPhysics/src/OvPhysics/Tools/Conversion.cpp +++ b/Sources/Overload/OvPhysics/src/OvPhysics/Tools/Conversion.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvPhysics/Tools/Conversion.h" diff --git a/Sources/Overload/OvRendering/include/OvRendering/API/Export.h b/Sources/Overload/OvRendering/include/OvRendering/API/Export.h index fe650f85..dfaff0f1 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/API/Export.h +++ b/Sources/Overload/OvRendering/include/OvRendering/API/Export.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvRendering/include/OvRendering/Buffers/EAccessSpecifier.h b/Sources/Overload/OvRendering/include/OvRendering/Buffers/EAccessSpecifier.h index db3f5097..afd48144 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/Buffers/EAccessSpecifier.h +++ b/Sources/Overload/OvRendering/include/OvRendering/Buffers/EAccessSpecifier.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvRendering/include/OvRendering/Buffers/Framebuffer.h b/Sources/Overload/OvRendering/include/OvRendering/Buffers/Framebuffer.h index c74e1f84..2fc2bbb2 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/Buffers/Framebuffer.h +++ b/Sources/Overload/OvRendering/include/OvRendering/Buffers/Framebuffer.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvRendering/include/OvRendering/Buffers/IndexBuffer.h b/Sources/Overload/OvRendering/include/OvRendering/Buffers/IndexBuffer.h index ee0602ec..a51f135f 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/Buffers/IndexBuffer.h +++ b/Sources/Overload/OvRendering/include/OvRendering/Buffers/IndexBuffer.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvRendering/include/OvRendering/Buffers/ShaderStorageBuffer.h b/Sources/Overload/OvRendering/include/OvRendering/Buffers/ShaderStorageBuffer.h index 98c103f8..d384caf5 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/Buffers/ShaderStorageBuffer.h +++ b/Sources/Overload/OvRendering/include/OvRendering/Buffers/ShaderStorageBuffer.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvRendering/include/OvRendering/Buffers/ShaderStorageBuffer.inl b/Sources/Overload/OvRendering/include/OvRendering/Buffers/ShaderStorageBuffer.inl index c0c0dd2a..6d05f8b1 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/Buffers/ShaderStorageBuffer.inl +++ b/Sources/Overload/OvRendering/include/OvRendering/Buffers/ShaderStorageBuffer.inl @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvRendering/include/OvRendering/Buffers/UniformBuffer.h b/Sources/Overload/OvRendering/include/OvRendering/Buffers/UniformBuffer.h index 8d0b2cf9..392002d9 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/Buffers/UniformBuffer.h +++ b/Sources/Overload/OvRendering/include/OvRendering/Buffers/UniformBuffer.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvRendering/include/OvRendering/Buffers/UniformBuffer.inl b/Sources/Overload/OvRendering/include/OvRendering/Buffers/UniformBuffer.inl index d1882074..2492aca5 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/Buffers/UniformBuffer.inl +++ b/Sources/Overload/OvRendering/include/OvRendering/Buffers/UniformBuffer.inl @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvRendering/include/OvRendering/Buffers/VertexArray.h b/Sources/Overload/OvRendering/include/OvRendering/Buffers/VertexArray.h index b4af2bea..c5237485 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/Buffers/VertexArray.h +++ b/Sources/Overload/OvRendering/include/OvRendering/Buffers/VertexArray.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvRendering/include/OvRendering/Buffers/VertexArray.inl b/Sources/Overload/OvRendering/include/OvRendering/Buffers/VertexArray.inl index 07a0e477..c49186b0 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/Buffers/VertexArray.inl +++ b/Sources/Overload/OvRendering/include/OvRendering/Buffers/VertexArray.inl @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvRendering/include/OvRendering/Buffers/VertexBuffer.h b/Sources/Overload/OvRendering/include/OvRendering/Buffers/VertexBuffer.h index 913cd8e8..ac5a9f8d 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/Buffers/VertexBuffer.h +++ b/Sources/Overload/OvRendering/include/OvRendering/Buffers/VertexBuffer.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvRendering/include/OvRendering/Buffers/VertexBuffer.inl b/Sources/Overload/OvRendering/include/OvRendering/Buffers/VertexBuffer.inl index 716de34a..cd625790 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/Buffers/VertexBuffer.inl +++ b/Sources/Overload/OvRendering/include/OvRendering/Buffers/VertexBuffer.inl @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvRendering/include/OvRendering/Context/Driver.h b/Sources/Overload/OvRendering/include/OvRendering/Context/Driver.h index 47113b06..5eba8f7f 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/Context/Driver.h +++ b/Sources/Overload/OvRendering/include/OvRendering/Context/Driver.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvRendering/include/OvRendering/Core/Renderer.h b/Sources/Overload/OvRendering/include/OvRendering/Core/Renderer.h index 85ccac68..b216ffdb 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/Core/Renderer.h +++ b/Sources/Overload/OvRendering/include/OvRendering/Core/Renderer.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvRendering/include/OvRendering/Core/ShapeDrawer.h b/Sources/Overload/OvRendering/include/OvRendering/Core/ShapeDrawer.h index be4210f2..a4014a9c 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/Core/ShapeDrawer.h +++ b/Sources/Overload/OvRendering/include/OvRendering/Core/ShapeDrawer.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvRendering/include/OvRendering/Data/Frustum.h b/Sources/Overload/OvRendering/include/OvRendering/Data/Frustum.h index 5ae3d70b..f27b8fff 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/Data/Frustum.h +++ b/Sources/Overload/OvRendering/include/OvRendering/Data/Frustum.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvRendering/include/OvRendering/Entities/Light.h b/Sources/Overload/OvRendering/include/OvRendering/Entities/Light.h index 9c40e00f..3ec21354 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/Entities/Light.h +++ b/Sources/Overload/OvRendering/include/OvRendering/Entities/Light.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvRendering/include/OvRendering/Geometry/BoundingSphere.h b/Sources/Overload/OvRendering/include/OvRendering/Geometry/BoundingSphere.h index a23af145..1f1d650d 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/Geometry/BoundingSphere.h +++ b/Sources/Overload/OvRendering/include/OvRendering/Geometry/BoundingSphere.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvRendering/include/OvRendering/Geometry/Vertex.h b/Sources/Overload/OvRendering/include/OvRendering/Geometry/Vertex.h index 9a901d64..b992fd7a 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/Geometry/Vertex.h +++ b/Sources/Overload/OvRendering/include/OvRendering/Geometry/Vertex.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvRendering/include/OvRendering/LowRenderer/Camera.h b/Sources/Overload/OvRendering/include/OvRendering/LowRenderer/Camera.h index 231e7da1..36a08dac 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/LowRenderer/Camera.h +++ b/Sources/Overload/OvRendering/include/OvRendering/LowRenderer/Camera.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvRendering/include/OvRendering/Resources/IMesh.h b/Sources/Overload/OvRendering/include/OvRendering/Resources/IMesh.h index 7dc9b40f..4ab36f08 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/Resources/IMesh.h +++ b/Sources/Overload/OvRendering/include/OvRendering/Resources/IMesh.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvRendering/include/OvRendering/Resources/Loaders/ModelLoader.h b/Sources/Overload/OvRendering/include/OvRendering/Resources/Loaders/ModelLoader.h index 403a7df9..743eb7fb 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/Resources/Loaders/ModelLoader.h +++ b/Sources/Overload/OvRendering/include/OvRendering/Resources/Loaders/ModelLoader.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvRendering/include/OvRendering/Resources/Loaders/ShaderLoader.h b/Sources/Overload/OvRendering/include/OvRendering/Resources/Loaders/ShaderLoader.h index 2ab31ff8..21c2d234 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/Resources/Loaders/ShaderLoader.h +++ b/Sources/Overload/OvRendering/include/OvRendering/Resources/Loaders/ShaderLoader.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvRendering/include/OvRendering/Resources/Loaders/TextureLoader.h b/Sources/Overload/OvRendering/include/OvRendering/Resources/Loaders/TextureLoader.h index a6c3bd2a..45028252 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/Resources/Loaders/TextureLoader.h +++ b/Sources/Overload/OvRendering/include/OvRendering/Resources/Loaders/TextureLoader.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvRendering/include/OvRendering/Resources/Mesh.h b/Sources/Overload/OvRendering/include/OvRendering/Resources/Mesh.h index df677dbc..0164af18 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/Resources/Mesh.h +++ b/Sources/Overload/OvRendering/include/OvRendering/Resources/Mesh.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvRendering/include/OvRendering/Resources/Model.h b/Sources/Overload/OvRendering/include/OvRendering/Resources/Model.h index 717bb2d5..095320a3 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/Resources/Model.h +++ b/Sources/Overload/OvRendering/include/OvRendering/Resources/Model.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvRendering/include/OvRendering/Resources/Parsers/AssimpParser.h b/Sources/Overload/OvRendering/include/OvRendering/Resources/Parsers/AssimpParser.h index f353bac8..0ed7f64c 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/Resources/Parsers/AssimpParser.h +++ b/Sources/Overload/OvRendering/include/OvRendering/Resources/Parsers/AssimpParser.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvRendering/include/OvRendering/Resources/Parsers/EModelParserFlags.h b/Sources/Overload/OvRendering/include/OvRendering/Resources/Parsers/EModelParserFlags.h index 727a937a..86dd202b 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/Resources/Parsers/EModelParserFlags.h +++ b/Sources/Overload/OvRendering/include/OvRendering/Resources/Parsers/EModelParserFlags.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvRendering/include/OvRendering/Resources/Parsers/IModelParser.h b/Sources/Overload/OvRendering/include/OvRendering/Resources/Parsers/IModelParser.h index e8954e2d..ff63bd3a 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/Resources/Parsers/IModelParser.h +++ b/Sources/Overload/OvRendering/include/OvRendering/Resources/Parsers/IModelParser.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvRendering/include/OvRendering/Resources/Shader.h b/Sources/Overload/OvRendering/include/OvRendering/Resources/Shader.h index ad8562bf..ac87a15c 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/Resources/Shader.h +++ b/Sources/Overload/OvRendering/include/OvRendering/Resources/Shader.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvRendering/include/OvRendering/Resources/Texture.h b/Sources/Overload/OvRendering/include/OvRendering/Resources/Texture.h index c711b131..62221d1f 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/Resources/Texture.h +++ b/Sources/Overload/OvRendering/include/OvRendering/Resources/Texture.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvRendering/include/OvRendering/Resources/UniformInfo.h b/Sources/Overload/OvRendering/include/OvRendering/Resources/UniformInfo.h index 9bc71655..d994bd53 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/Resources/UniformInfo.h +++ b/Sources/Overload/OvRendering/include/OvRendering/Resources/UniformInfo.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvRendering/include/OvRendering/Resources/UniformType.h b/Sources/Overload/OvRendering/include/OvRendering/Resources/UniformType.h index aab6314c..a3756a03 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/Resources/UniformType.h +++ b/Sources/Overload/OvRendering/include/OvRendering/Resources/UniformType.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvRendering/include/OvRendering/Settings/DriverSettings.h b/Sources/Overload/OvRendering/include/OvRendering/Settings/DriverSettings.h index 02b18015..55cc50db 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/Settings/DriverSettings.h +++ b/Sources/Overload/OvRendering/include/OvRendering/Settings/DriverSettings.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvRendering/include/OvRendering/Settings/EComparaisonAlgorithm.h b/Sources/Overload/OvRendering/include/OvRendering/Settings/EComparaisonAlgorithm.h index 6d8516d6..6455e78c 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/Settings/EComparaisonAlgorithm.h +++ b/Sources/Overload/OvRendering/include/OvRendering/Settings/EComparaisonAlgorithm.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvRendering/include/OvRendering/Settings/ECullFace.h b/Sources/Overload/OvRendering/include/OvRendering/Settings/ECullFace.h index ff74fb65..c85b4b05 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/Settings/ECullFace.h +++ b/Sources/Overload/OvRendering/include/OvRendering/Settings/ECullFace.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvRendering/include/OvRendering/Settings/ECullingOptions.h b/Sources/Overload/OvRendering/include/OvRendering/Settings/ECullingOptions.h index 3f7dda92..e2b06c92 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/Settings/ECullingOptions.h +++ b/Sources/Overload/OvRendering/include/OvRendering/Settings/ECullingOptions.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvRendering/include/OvRendering/Settings/EOperation.h b/Sources/Overload/OvRendering/include/OvRendering/Settings/EOperation.h index 2b6d1c00..ae94f6ee 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/Settings/EOperation.h +++ b/Sources/Overload/OvRendering/include/OvRendering/Settings/EOperation.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvRendering/include/OvRendering/Settings/EPrimitiveMode.h b/Sources/Overload/OvRendering/include/OvRendering/Settings/EPrimitiveMode.h index 4b9c7ed1..a4aec138 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/Settings/EPrimitiveMode.h +++ b/Sources/Overload/OvRendering/include/OvRendering/Settings/EPrimitiveMode.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvRendering/include/OvRendering/Settings/ERasterizationMode.h b/Sources/Overload/OvRendering/include/OvRendering/Settings/ERasterizationMode.h index ce858b8b..983f1582 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/Settings/ERasterizationMode.h +++ b/Sources/Overload/OvRendering/include/OvRendering/Settings/ERasterizationMode.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvRendering/include/OvRendering/Settings/ERenderingCapability.h b/Sources/Overload/OvRendering/include/OvRendering/Settings/ERenderingCapability.h index 8d08a2da..c2cb2d49 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/Settings/ERenderingCapability.h +++ b/Sources/Overload/OvRendering/include/OvRendering/Settings/ERenderingCapability.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvRendering/include/OvRendering/Settings/ETextureFilteringMode.h b/Sources/Overload/OvRendering/include/OvRendering/Settings/ETextureFilteringMode.h index d7260270..256ba21c 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/Settings/ETextureFilteringMode.h +++ b/Sources/Overload/OvRendering/include/OvRendering/Settings/ETextureFilteringMode.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvRendering/src/OvRendering/Buffers/Framebuffer.cpp b/Sources/Overload/OvRendering/src/OvRendering/Buffers/Framebuffer.cpp index d0b3eac6..988e5c23 100644 --- a/Sources/Overload/OvRendering/src/OvRendering/Buffers/Framebuffer.cpp +++ b/Sources/Overload/OvRendering/src/OvRendering/Buffers/Framebuffer.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvRendering/src/OvRendering/Buffers/IndexBuffer.cpp b/Sources/Overload/OvRendering/src/OvRendering/Buffers/IndexBuffer.cpp index ae28cd91..6a6321b8 100644 --- a/Sources/Overload/OvRendering/src/OvRendering/Buffers/IndexBuffer.cpp +++ b/Sources/Overload/OvRendering/src/OvRendering/Buffers/IndexBuffer.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvRendering/src/OvRendering/Buffers/ShaderStorageBuffer.cpp b/Sources/Overload/OvRendering/src/OvRendering/Buffers/ShaderStorageBuffer.cpp index cce0469b..e52a66d7 100644 --- a/Sources/Overload/OvRendering/src/OvRendering/Buffers/ShaderStorageBuffer.cpp +++ b/Sources/Overload/OvRendering/src/OvRendering/Buffers/ShaderStorageBuffer.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvRendering/src/OvRendering/Buffers/UniformBuffer.cpp b/Sources/Overload/OvRendering/src/OvRendering/Buffers/UniformBuffer.cpp index eb82384e..82fa84db 100644 --- a/Sources/Overload/OvRendering/src/OvRendering/Buffers/UniformBuffer.cpp +++ b/Sources/Overload/OvRendering/src/OvRendering/Buffers/UniformBuffer.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvRendering/src/OvRendering/Buffers/VertexArray.cpp b/Sources/Overload/OvRendering/src/OvRendering/Buffers/VertexArray.cpp index db3945aa..80d362c5 100644 --- a/Sources/Overload/OvRendering/src/OvRendering/Buffers/VertexArray.cpp +++ b/Sources/Overload/OvRendering/src/OvRendering/Buffers/VertexArray.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvRendering/Buffers/VertexArray.h" diff --git a/Sources/Overload/OvRendering/src/OvRendering/Context/Driver.cpp b/Sources/Overload/OvRendering/src/OvRendering/Context/Driver.cpp index 7ad9d31f..98fc03c7 100644 --- a/Sources/Overload/OvRendering/src/OvRendering/Context/Driver.cpp +++ b/Sources/Overload/OvRendering/src/OvRendering/Context/Driver.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvRendering/src/OvRendering/Core/Renderer.cpp b/Sources/Overload/OvRendering/src/OvRendering/Core/Renderer.cpp index a12ee632..9f0a9941 100644 --- a/Sources/Overload/OvRendering/src/OvRendering/Core/Renderer.cpp +++ b/Sources/Overload/OvRendering/src/OvRendering/Core/Renderer.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvRendering/src/OvRendering/Core/ShapeDrawer.cpp b/Sources/Overload/OvRendering/src/OvRendering/Core/ShapeDrawer.cpp index 5cedc90b..4b486cdc 100644 --- a/Sources/Overload/OvRendering/src/OvRendering/Core/ShapeDrawer.cpp +++ b/Sources/Overload/OvRendering/src/OvRendering/Core/ShapeDrawer.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvRendering/Core/ShapeDrawer.h" diff --git a/Sources/Overload/OvRendering/src/OvRendering/Data/Frustum.cpp b/Sources/Overload/OvRendering/src/OvRendering/Data/Frustum.cpp index 3830c3e1..edd163af 100644 --- a/Sources/Overload/OvRendering/src/OvRendering/Data/Frustum.cpp +++ b/Sources/Overload/OvRendering/src/OvRendering/Data/Frustum.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvRendering/src/OvRendering/Entities/Light.cpp b/Sources/Overload/OvRendering/src/OvRendering/Entities/Light.cpp index 0f08be15..407feb26 100644 --- a/Sources/Overload/OvRendering/src/OvRendering/Entities/Light.cpp +++ b/Sources/Overload/OvRendering/src/OvRendering/Entities/Light.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvRendering/Entities/Light.h" diff --git a/Sources/Overload/OvRendering/src/OvRendering/LowRenderer/Camera.cpp b/Sources/Overload/OvRendering/src/OvRendering/LowRenderer/Camera.cpp index 66c05a52..7a38d73a 100644 --- a/Sources/Overload/OvRendering/src/OvRendering/LowRenderer/Camera.cpp +++ b/Sources/Overload/OvRendering/src/OvRendering/LowRenderer/Camera.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvRendering/src/OvRendering/Resources/Loaders/ModelLoader.cpp b/Sources/Overload/OvRendering/src/OvRendering/Resources/Loaders/ModelLoader.cpp index f1f13ccb..caec5684 100644 --- a/Sources/Overload/OvRendering/src/OvRendering/Resources/Loaders/ModelLoader.cpp +++ b/Sources/Overload/OvRendering/src/OvRendering/Resources/Loaders/ModelLoader.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvRendering/Resources/Loaders/ModelLoader.h" diff --git a/Sources/Overload/OvRendering/src/OvRendering/Resources/Loaders/ShaderLoader.cpp b/Sources/Overload/OvRendering/src/OvRendering/Resources/Loaders/ShaderLoader.cpp index 974fac47..650d24e3 100644 --- a/Sources/Overload/OvRendering/src/OvRendering/Resources/Loaders/ShaderLoader.cpp +++ b/Sources/Overload/OvRendering/src/OvRendering/Resources/Loaders/ShaderLoader.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvRendering/src/OvRendering/Resources/Loaders/TextureLoader.cpp b/Sources/Overload/OvRendering/src/OvRendering/Resources/Loaders/TextureLoader.cpp index 8d5078cc..b9eb7b57 100644 --- a/Sources/Overload/OvRendering/src/OvRendering/Resources/Loaders/TextureLoader.cpp +++ b/Sources/Overload/OvRendering/src/OvRendering/Resources/Loaders/TextureLoader.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #define STB_IMAGE_IMPLEMENTATION diff --git a/Sources/Overload/OvRendering/src/OvRendering/Resources/Mesh.cpp b/Sources/Overload/OvRendering/src/OvRendering/Resources/Mesh.cpp index b39cbe99..6e902c75 100644 --- a/Sources/Overload/OvRendering/src/OvRendering/Resources/Mesh.cpp +++ b/Sources/Overload/OvRendering/src/OvRendering/Resources/Mesh.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvRendering/src/OvRendering/Resources/Model.cpp b/Sources/Overload/OvRendering/src/OvRendering/Resources/Model.cpp index 9896a6c1..891186e6 100644 --- a/Sources/Overload/OvRendering/src/OvRendering/Resources/Model.cpp +++ b/Sources/Overload/OvRendering/src/OvRendering/Resources/Model.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvRendering/src/OvRendering/Resources/Parsers/AssimpParser.cpp b/Sources/Overload/OvRendering/src/OvRendering/Resources/Parsers/AssimpParser.cpp index fd3952f2..a2b01866 100644 --- a/Sources/Overload/OvRendering/src/OvRendering/Resources/Parsers/AssimpParser.cpp +++ b/Sources/Overload/OvRendering/src/OvRendering/Resources/Parsers/AssimpParser.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvRendering/src/OvRendering/Resources/Shader.cpp b/Sources/Overload/OvRendering/src/OvRendering/Resources/Shader.cpp index f17abeb0..f8f58430 100644 --- a/Sources/Overload/OvRendering/src/OvRendering/Resources/Shader.cpp +++ b/Sources/Overload/OvRendering/src/OvRendering/Resources/Shader.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvRendering/src/OvRendering/Resources/Texture.cpp b/Sources/Overload/OvRendering/src/OvRendering/Resources/Texture.cpp index 178fc57e..97c9f27d 100644 --- a/Sources/Overload/OvRendering/src/OvRendering/Resources/Texture.cpp +++ b/Sources/Overload/OvRendering/src/OvRendering/Resources/Texture.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvTools/include/OvTools/API/Export.h b/Sources/Overload/OvTools/include/OvTools/API/Export.h index 9208d88a..fd63f4e2 100644 --- a/Sources/Overload/OvTools/include/OvTools/API/Export.h +++ b/Sources/Overload/OvTools/include/OvTools/API/Export.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvTools/include/OvTools/Eventing/Event.h b/Sources/Overload/OvTools/include/OvTools/Eventing/Event.h index 96b4ec1d..14b534c4 100644 --- a/Sources/Overload/OvTools/include/OvTools/Eventing/Event.h +++ b/Sources/Overload/OvTools/include/OvTools/Eventing/Event.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvTools/include/OvTools/Eventing/Event.inl b/Sources/Overload/OvTools/include/OvTools/Eventing/Event.inl index bb63d5b3..664d2e10 100644 --- a/Sources/Overload/OvTools/include/OvTools/Eventing/Event.inl +++ b/Sources/Overload/OvTools/include/OvTools/Eventing/Event.inl @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvTools/include/OvTools/Filesystem/IniFile.h b/Sources/Overload/OvTools/include/OvTools/Filesystem/IniFile.h index 2e263d68..52691f88 100644 --- a/Sources/Overload/OvTools/include/OvTools/Filesystem/IniFile.h +++ b/Sources/Overload/OvTools/include/OvTools/Filesystem/IniFile.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvTools/include/OvTools/Filesystem/IniFile.inl b/Sources/Overload/OvTools/include/OvTools/Filesystem/IniFile.inl index 07ed7321..1fc0f5fd 100644 --- a/Sources/Overload/OvTools/include/OvTools/Filesystem/IniFile.inl +++ b/Sources/Overload/OvTools/include/OvTools/Filesystem/IniFile.inl @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvTools/include/OvTools/Time/Clock.h b/Sources/Overload/OvTools/include/OvTools/Time/Clock.h index 1d3354c1..98214799 100644 --- a/Sources/Overload/OvTools/include/OvTools/Time/Clock.h +++ b/Sources/Overload/OvTools/include/OvTools/Time/Clock.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvTools/include/OvTools/Time/Date.h b/Sources/Overload/OvTools/include/OvTools/Time/Date.h index 09b03d2a..4453165d 100644 --- a/Sources/Overload/OvTools/include/OvTools/Time/Date.h +++ b/Sources/Overload/OvTools/include/OvTools/Time/Date.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvTools/include/OvTools/Utils/PathParser.h b/Sources/Overload/OvTools/include/OvTools/Utils/PathParser.h index fb0699cd..68c688ec 100644 --- a/Sources/Overload/OvTools/include/OvTools/Utils/PathParser.h +++ b/Sources/Overload/OvTools/include/OvTools/Utils/PathParser.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvTools/include/OvTools/Utils/Random.h b/Sources/Overload/OvTools/include/OvTools/Utils/Random.h index 673bc705..ad25f856 100644 --- a/Sources/Overload/OvTools/include/OvTools/Utils/Random.h +++ b/Sources/Overload/OvTools/include/OvTools/Utils/Random.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvTools/include/OvTools/Utils/ReferenceOrValue.h b/Sources/Overload/OvTools/include/OvTools/Utils/ReferenceOrValue.h index 5b8880c6..8436367a 100644 --- a/Sources/Overload/OvTools/include/OvTools/Utils/ReferenceOrValue.h +++ b/Sources/Overload/OvTools/include/OvTools/Utils/ReferenceOrValue.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvTools/include/OvTools/Utils/String.h b/Sources/Overload/OvTools/include/OvTools/Utils/String.h index a0c958c1..0fb3a889 100644 --- a/Sources/Overload/OvTools/include/OvTools/Utils/String.h +++ b/Sources/Overload/OvTools/include/OvTools/Utils/String.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvTools/include/OvTools/Utils/SystemCalls.h b/Sources/Overload/OvTools/include/OvTools/Utils/SystemCalls.h index 23674be8..4d272070 100644 --- a/Sources/Overload/OvTools/include/OvTools/Utils/SystemCalls.h +++ b/Sources/Overload/OvTools/include/OvTools/Utils/SystemCalls.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvTools/src/OvTools/Filesystem/IniFile.cpp b/Sources/Overload/OvTools/src/OvTools/Filesystem/IniFile.cpp index cab66149..ba374a09 100644 --- a/Sources/Overload/OvTools/src/OvTools/Filesystem/IniFile.cpp +++ b/Sources/Overload/OvTools/src/OvTools/Filesystem/IniFile.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvTools/Filesystem/IniFile.h" diff --git a/Sources/Overload/OvTools/src/OvTools/Time/Clock.cpp b/Sources/Overload/OvTools/src/OvTools/Time/Clock.cpp index d07e3fff..6e4ec12d 100644 --- a/Sources/Overload/OvTools/src/OvTools/Time/Clock.cpp +++ b/Sources/Overload/OvTools/src/OvTools/Time/Clock.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvTools/Time/Clock.h" diff --git a/Sources/Overload/OvTools/src/OvTools/Time/Date.cpp b/Sources/Overload/OvTools/src/OvTools/Time/Date.cpp index 7a938591..a0a4554b 100644 --- a/Sources/Overload/OvTools/src/OvTools/Time/Date.cpp +++ b/Sources/Overload/OvTools/src/OvTools/Time/Date.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvTools/src/OvTools/Utils/PathParser.cpp b/Sources/Overload/OvTools/src/OvTools/Utils/PathParser.cpp index 3c97894b..5969e235 100644 --- a/Sources/Overload/OvTools/src/OvTools/Utils/PathParser.cpp +++ b/Sources/Overload/OvTools/src/OvTools/Utils/PathParser.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvTools/src/OvTools/Utils/Random.cpp b/Sources/Overload/OvTools/src/OvTools/Utils/Random.cpp index 4292f29b..c506231c 100644 --- a/Sources/Overload/OvTools/src/OvTools/Utils/Random.cpp +++ b/Sources/Overload/OvTools/src/OvTools/Utils/Random.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvTools/Utils/Random.h" diff --git a/Sources/Overload/OvTools/src/OvTools/Utils/String.cpp b/Sources/Overload/OvTools/src/OvTools/Utils/String.cpp index 51aed52e..92b083d2 100644 --- a/Sources/Overload/OvTools/src/OvTools/Utils/String.cpp +++ b/Sources/Overload/OvTools/src/OvTools/Utils/String.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvTools/Utils/String.h" diff --git a/Sources/Overload/OvTools/src/OvTools/Utils/SystemCalls.cpp b/Sources/Overload/OvTools/src/OvTools/Utils/SystemCalls.cpp index 1e265c37..ed88dc0c 100644 --- a/Sources/Overload/OvTools/src/OvTools/Utils/SystemCalls.cpp +++ b/Sources/Overload/OvTools/src/OvTools/Utils/SystemCalls.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvTools/Utils/PathParser.h" diff --git a/Sources/Overload/OvUI/include/OvUI/API/Export.h b/Sources/Overload/OvUI/include/OvUI/API/Export.h index 12aa129e..19eb0abe 100644 --- a/Sources/Overload/OvUI/include/OvUI/API/Export.h +++ b/Sources/Overload/OvUI/include/OvUI/API/Export.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/API/IDrawable.h b/Sources/Overload/OvUI/include/OvUI/API/IDrawable.h index 9ea92857..1c0eb8d0 100644 --- a/Sources/Overload/OvUI/include/OvUI/API/IDrawable.h +++ b/Sources/Overload/OvUI/include/OvUI/API/IDrawable.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Core/UIManager.h b/Sources/Overload/OvUI/include/OvUI/Core/UIManager.h index 7815b177..f27448ac 100644 --- a/Sources/Overload/OvUI/include/OvUI/Core/UIManager.h +++ b/Sources/Overload/OvUI/include/OvUI/Core/UIManager.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Internal/Converter.h b/Sources/Overload/OvUI/include/OvUI/Internal/Converter.h index dcfa5849..e002b294 100644 --- a/Sources/Overload/OvUI/include/OvUI/Internal/Converter.h +++ b/Sources/Overload/OvUI/include/OvUI/Internal/Converter.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Internal/EMemoryMode.h b/Sources/Overload/OvUI/include/OvUI/Internal/EMemoryMode.h index d774a270..1907642d 100644 --- a/Sources/Overload/OvUI/include/OvUI/Internal/EMemoryMode.h +++ b/Sources/Overload/OvUI/include/OvUI/Internal/EMemoryMode.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Internal/TextureID.h b/Sources/Overload/OvUI/include/OvUI/Internal/TextureID.h index 9343b701..48dcda62 100644 --- a/Sources/Overload/OvUI/include/OvUI/Internal/TextureID.h +++ b/Sources/Overload/OvUI/include/OvUI/Internal/TextureID.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Internal/WidgetContainer.h b/Sources/Overload/OvUI/include/OvUI/Internal/WidgetContainer.h index aaf1715e..af1c4d62 100644 --- a/Sources/Overload/OvUI/include/OvUI/Internal/WidgetContainer.h +++ b/Sources/Overload/OvUI/include/OvUI/Internal/WidgetContainer.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Modules/Canvas.h b/Sources/Overload/OvUI/include/OvUI/Modules/Canvas.h index 4d0e9b1b..08ef4b57 100644 --- a/Sources/Overload/OvUI/include/OvUI/Modules/Canvas.h +++ b/Sources/Overload/OvUI/include/OvUI/Modules/Canvas.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Panels/APanel.h b/Sources/Overload/OvUI/include/OvUI/Panels/APanel.h index d2f5fd7a..b8390d0f 100644 --- a/Sources/Overload/OvUI/include/OvUI/Panels/APanel.h +++ b/Sources/Overload/OvUI/include/OvUI/Panels/APanel.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Panels/APanelTransformable.h b/Sources/Overload/OvUI/include/OvUI/Panels/APanelTransformable.h index d78bf3e5..64c81021 100644 --- a/Sources/Overload/OvUI/include/OvUI/Panels/APanelTransformable.h +++ b/Sources/Overload/OvUI/include/OvUI/Panels/APanelTransformable.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Panels/PanelMenuBar.h b/Sources/Overload/OvUI/include/OvUI/Panels/PanelMenuBar.h index c7a641b0..7fd4d415 100644 --- a/Sources/Overload/OvUI/include/OvUI/Panels/PanelMenuBar.h +++ b/Sources/Overload/OvUI/include/OvUI/Panels/PanelMenuBar.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Panels/PanelUndecorated.h b/Sources/Overload/OvUI/include/OvUI/Panels/PanelUndecorated.h index ec89b2a2..0b22393a 100644 --- a/Sources/Overload/OvUI/include/OvUI/Panels/PanelUndecorated.h +++ b/Sources/Overload/OvUI/include/OvUI/Panels/PanelUndecorated.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Panels/PanelWindow.h b/Sources/Overload/OvUI/include/OvUI/Panels/PanelWindow.h index b25d7cfb..efc40867 100644 --- a/Sources/Overload/OvUI/include/OvUI/Panels/PanelWindow.h +++ b/Sources/Overload/OvUI/include/OvUI/Panels/PanelWindow.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Plugins/ContextualMenu.h b/Sources/Overload/OvUI/include/OvUI/Plugins/ContextualMenu.h index 587f204a..ae93c3db 100644 --- a/Sources/Overload/OvUI/include/OvUI/Plugins/ContextualMenu.h +++ b/Sources/Overload/OvUI/include/OvUI/Plugins/ContextualMenu.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Plugins/DDSource.h b/Sources/Overload/OvUI/include/OvUI/Plugins/DDSource.h index ac5fd62f..f5327633 100644 --- a/Sources/Overload/OvUI/include/OvUI/Plugins/DDSource.h +++ b/Sources/Overload/OvUI/include/OvUI/Plugins/DDSource.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Plugins/DDTarget.h b/Sources/Overload/OvUI/include/OvUI/Plugins/DDTarget.h index 80c5d07b..dfa18012 100644 --- a/Sources/Overload/OvUI/include/OvUI/Plugins/DDTarget.h +++ b/Sources/Overload/OvUI/include/OvUI/Plugins/DDTarget.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Plugins/DataDispatcher.h b/Sources/Overload/OvUI/include/OvUI/Plugins/DataDispatcher.h index 0870c5bb..2420c9a4 100644 --- a/Sources/Overload/OvUI/include/OvUI/Plugins/DataDispatcher.h +++ b/Sources/Overload/OvUI/include/OvUI/Plugins/DataDispatcher.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Plugins/IPlugin.h b/Sources/Overload/OvUI/include/OvUI/Plugins/IPlugin.h index d8ae5a99..516afa2a 100644 --- a/Sources/Overload/OvUI/include/OvUI/Plugins/IPlugin.h +++ b/Sources/Overload/OvUI/include/OvUI/Plugins/IPlugin.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Plugins/Pluginable.h b/Sources/Overload/OvUI/include/OvUI/Plugins/Pluginable.h index 6adb3870..69a8ca34 100644 --- a/Sources/Overload/OvUI/include/OvUI/Plugins/Pluginable.h +++ b/Sources/Overload/OvUI/include/OvUI/Plugins/Pluginable.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Settings/Alignment.h b/Sources/Overload/OvUI/include/OvUI/Settings/Alignment.h index f2e15e0d..d7fec5a8 100644 --- a/Sources/Overload/OvUI/include/OvUI/Settings/Alignment.h +++ b/Sources/Overload/OvUI/include/OvUI/Settings/Alignment.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Settings/PanelWindowSettings.h b/Sources/Overload/OvUI/include/OvUI/Settings/PanelWindowSettings.h index bb4e3ca9..7b462d75 100644 --- a/Sources/Overload/OvUI/include/OvUI/Settings/PanelWindowSettings.h +++ b/Sources/Overload/OvUI/include/OvUI/Settings/PanelWindowSettings.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Styling/EStyle.h b/Sources/Overload/OvUI/include/OvUI/Styling/EStyle.h index 49c5554b..14c2be19 100644 --- a/Sources/Overload/OvUI/include/OvUI/Styling/EStyle.h +++ b/Sources/Overload/OvUI/include/OvUI/Styling/EStyle.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Types/Color.h b/Sources/Overload/OvUI/include/OvUI/Types/Color.h index 913beb07..5a01d031 100644 --- a/Sources/Overload/OvUI/include/OvUI/Types/Color.h +++ b/Sources/Overload/OvUI/include/OvUI/Types/Color.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/AWidget.h b/Sources/Overload/OvUI/include/OvUI/Widgets/AWidget.h index 66c48d7a..ef1ac989 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/AWidget.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/AWidget.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Buttons/AButton.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Buttons/AButton.h index 1c04c160..b275d99a 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Buttons/AButton.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Buttons/AButton.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Buttons/Button.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Buttons/Button.h index d1695dba..ac3ef377 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Buttons/Button.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Buttons/Button.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Buttons/ButtonArrow.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Buttons/ButtonArrow.h index ecc919f5..d4906136 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Buttons/ButtonArrow.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Buttons/ButtonArrow.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Buttons/ButtonColored.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Buttons/ButtonColored.h index e543e26f..a976e2e7 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Buttons/ButtonColored.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Buttons/ButtonColored.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Buttons/ButtonImage.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Buttons/ButtonImage.h index 5a29ad9e..f19d3668 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Buttons/ButtonImage.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Buttons/ButtonImage.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Buttons/ButtonSmall.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Buttons/ButtonSmall.h index 4b4bd876..08f5fff3 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Buttons/ButtonSmall.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Buttons/ButtonSmall.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/DataWidget.h b/Sources/Overload/OvUI/include/OvUI/Widgets/DataWidget.h index 423ed4eb..d6007131 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/DataWidget.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/DataWidget.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Drags/DragDouble.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Drags/DragDouble.h index 3c893c4c..0c639b6f 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Drags/DragDouble.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Drags/DragDouble.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Drags/DragFloat.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Drags/DragFloat.h index 58e535b0..f09fb479 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Drags/DragFloat.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Drags/DragFloat.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Drags/DragInt.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Drags/DragInt.h index 066af267..8f706b7d 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Drags/DragInt.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Drags/DragInt.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Drags/DragMultipleDoubles.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Drags/DragMultipleDoubles.h index d00c0576..60069841 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Drags/DragMultipleDoubles.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Drags/DragMultipleDoubles.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Drags/DragMultipleFloats.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Drags/DragMultipleFloats.h index e9f7ec3c..5837a0b5 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Drags/DragMultipleFloats.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Drags/DragMultipleFloats.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Drags/DragMultipleInts.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Drags/DragMultipleInts.h index 3801d103..c0931c97 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Drags/DragMultipleInts.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Drags/DragMultipleInts.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Drags/DragMultipleScalars.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Drags/DragMultipleScalars.h index e30ca1a9..89751461 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Drags/DragMultipleScalars.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Drags/DragMultipleScalars.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Drags/DragSingleScalar.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Drags/DragSingleScalar.h index ed7a35f7..bafed38e 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Drags/DragSingleScalar.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Drags/DragSingleScalar.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/InputFields/InputDouble.h b/Sources/Overload/OvUI/include/OvUI/Widgets/InputFields/InputDouble.h index 1bec6f11..aa14343a 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/InputFields/InputDouble.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/InputFields/InputDouble.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/InputFields/InputFloat.h b/Sources/Overload/OvUI/include/OvUI/Widgets/InputFields/InputFloat.h index 708f16b7..45091730 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/InputFields/InputFloat.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/InputFields/InputFloat.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/InputFields/InputInt.h b/Sources/Overload/OvUI/include/OvUI/Widgets/InputFields/InputInt.h index 1f812cb3..16442764 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/InputFields/InputInt.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/InputFields/InputInt.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/InputFields/InputMultipleDoubles.h b/Sources/Overload/OvUI/include/OvUI/Widgets/InputFields/InputMultipleDoubles.h index 184b2b19..acb45e78 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/InputFields/InputMultipleDoubles.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/InputFields/InputMultipleDoubles.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/InputFields/InputMultipleFloats.h b/Sources/Overload/OvUI/include/OvUI/Widgets/InputFields/InputMultipleFloats.h index d981b8de..6df47946 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/InputFields/InputMultipleFloats.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/InputFields/InputMultipleFloats.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/InputFields/InputMultipleInts.h b/Sources/Overload/OvUI/include/OvUI/Widgets/InputFields/InputMultipleInts.h index 4f73ed03..ab7a3b3e 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/InputFields/InputMultipleInts.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/InputFields/InputMultipleInts.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/InputFields/InputMultipleScalars.h b/Sources/Overload/OvUI/include/OvUI/Widgets/InputFields/InputMultipleScalars.h index 0d3cd160..d1ef8b0b 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/InputFields/InputMultipleScalars.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/InputFields/InputMultipleScalars.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/InputFields/InputSingleScalar.h b/Sources/Overload/OvUI/include/OvUI/Widgets/InputFields/InputSingleScalar.h index c3388381..295ef5a7 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/InputFields/InputSingleScalar.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/InputFields/InputSingleScalar.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/InputFields/InputText.h b/Sources/Overload/OvUI/include/OvUI/Widgets/InputFields/InputText.h index a53a23ae..cdeb867e 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/InputFields/InputText.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/InputFields/InputText.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Layout/Columns.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Layout/Columns.h index 4f52ea1c..2977a1b5 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Layout/Columns.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Layout/Columns.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Layout/Dummy.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Layout/Dummy.h index 60cee1b9..cc6f54ee 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Layout/Dummy.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Layout/Dummy.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Layout/Group.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Layout/Group.h index 89ccd6be..8a6b12de 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Layout/Group.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Layout/Group.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Layout/GroupCollapsable.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Layout/GroupCollapsable.h index 52940e8f..86b9ef6f 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Layout/GroupCollapsable.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Layout/GroupCollapsable.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Layout/NewLine.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Layout/NewLine.h index 9f488730..c5b99ece 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Layout/NewLine.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Layout/NewLine.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Layout/Spacing.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Layout/Spacing.h index 95679c53..81134b12 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Layout/Spacing.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Layout/Spacing.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Layout/TreeNode.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Layout/TreeNode.h index 4fa26ec5..8ac290e9 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Layout/TreeNode.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Layout/TreeNode.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Menu/MenuItem.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Menu/MenuItem.h index cf5d602e..044de9f3 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Menu/MenuItem.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Menu/MenuItem.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Menu/MenuList.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Menu/MenuList.h index c9f559c9..07483bde 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Menu/MenuList.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Menu/MenuList.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Plots/APlot.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Plots/APlot.h index 5f567c51..afb989b2 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Plots/APlot.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Plots/APlot.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Plots/PlotHistogram.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Plots/PlotHistogram.h index 28ef8e10..732500eb 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Plots/PlotHistogram.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Plots/PlotHistogram.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Plots/PlotLines.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Plots/PlotLines.h index 5c832b2d..515c3761 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Plots/PlotLines.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Plots/PlotLines.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Selection/CheckBox.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Selection/CheckBox.h index d0fc00bc..72080a8a 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Selection/CheckBox.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Selection/CheckBox.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Selection/ColorEdit.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Selection/ColorEdit.h index 259f46e2..bc5d6ea4 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Selection/ColorEdit.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Selection/ColorEdit.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Selection/ColorPicker.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Selection/ColorPicker.h index 3d93b0b7..d40c4fd8 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Selection/ColorPicker.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Selection/ColorPicker.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Selection/ComboBox.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Selection/ComboBox.h index b323f594..757385a1 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Selection/ComboBox.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Selection/ComboBox.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Selection/RadioButton.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Selection/RadioButton.h index 97ad28d8..acb0c62a 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Selection/RadioButton.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Selection/RadioButton.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Selection/RadioButtonLinker.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Selection/RadioButtonLinker.h index 57d57739..bbaacafb 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Selection/RadioButtonLinker.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Selection/RadioButtonLinker.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Sliders/ESliderOrientation.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Sliders/ESliderOrientation.h index 7a82d26e..195e6baf 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Sliders/ESliderOrientation.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Sliders/ESliderOrientation.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Sliders/SliderDouble.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Sliders/SliderDouble.h index 7734c358..cd1f7c63 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Sliders/SliderDouble.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Sliders/SliderDouble.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Sliders/SliderFloat.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Sliders/SliderFloat.h index fa99cfd0..662dd6bf 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Sliders/SliderFloat.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Sliders/SliderFloat.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Sliders/SliderInt.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Sliders/SliderInt.h index a4df7b32..497a74d0 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Sliders/SliderInt.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Sliders/SliderInt.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Sliders/SliderMultipleDoubles.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Sliders/SliderMultipleDoubles.h index 736e5107..bbaf670d 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Sliders/SliderMultipleDoubles.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Sliders/SliderMultipleDoubles.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Sliders/SliderMultipleFloats.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Sliders/SliderMultipleFloats.h index 36668e77..2c8b2e14 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Sliders/SliderMultipleFloats.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Sliders/SliderMultipleFloats.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Sliders/SliderMultipleInts.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Sliders/SliderMultipleInts.h index b24864a1..5652ffc3 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Sliders/SliderMultipleInts.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Sliders/SliderMultipleInts.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Sliders/SliderMultipleScalars.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Sliders/SliderMultipleScalars.h index 52ccfe88..46ed89d3 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Sliders/SliderMultipleScalars.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Sliders/SliderMultipleScalars.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Sliders/SliderSingleScalar.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Sliders/SliderSingleScalar.h index b906b170..10b59bd3 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Sliders/SliderSingleScalar.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Sliders/SliderSingleScalar.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Texts/Text.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Texts/Text.h index ea16f220..0be235e6 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Texts/Text.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Texts/Text.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Texts/TextClickable.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Texts/TextClickable.h index 34596c49..b38bf26c 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Texts/TextClickable.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Texts/TextClickable.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Texts/TextColored.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Texts/TextColored.h index 8b73e006..2348d362 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Texts/TextColored.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Texts/TextColored.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Texts/TextDisabled.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Texts/TextDisabled.h index 4fac0dad..5b6d128a 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Texts/TextDisabled.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Texts/TextDisabled.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Texts/TextLabelled.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Texts/TextLabelled.h index d350bc77..f1796a62 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Texts/TextLabelled.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Texts/TextLabelled.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Texts/TextSelectable.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Texts/TextSelectable.h index 73a44fcf..0a0840e4 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Texts/TextSelectable.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Texts/TextSelectable.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Texts/TextWrapped.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Texts/TextWrapped.h index 1e9a8a70..b296d7e0 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Texts/TextWrapped.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Texts/TextWrapped.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Visual/Bullet.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Visual/Bullet.h index d57514f1..cebfdda5 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Visual/Bullet.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Visual/Bullet.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Visual/Image.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Visual/Image.h index 02add107..3198346d 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Visual/Image.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Visual/Image.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Visual/ProgressBar.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Visual/ProgressBar.h index a7a9f703..10822e10 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Visual/ProgressBar.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Visual/ProgressBar.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/include/OvUI/Widgets/Visual/Separator.h b/Sources/Overload/OvUI/include/OvUI/Widgets/Visual/Separator.h index 225229b6..f6ed0065 100644 --- a/Sources/Overload/OvUI/include/OvUI/Widgets/Visual/Separator.h +++ b/Sources/Overload/OvUI/include/OvUI/Widgets/Visual/Separator.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvUI/src/OvUI/Core/UIManager.cpp b/Sources/Overload/OvUI/src/OvUI/Core/UIManager.cpp index 7218b6d1..a459a545 100644 --- a/Sources/Overload/OvUI/src/OvUI/Core/UIManager.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Core/UIManager.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Core/UIManager.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Internal/Converter.cpp b/Sources/Overload/OvUI/src/OvUI/Internal/Converter.cpp index 375c111c..ebf17750 100644 --- a/Sources/Overload/OvUI/src/OvUI/Internal/Converter.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Internal/Converter.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Internal/Converter.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Internal/WidgetContainer.cpp b/Sources/Overload/OvUI/src/OvUI/Internal/WidgetContainer.cpp index cd68b690..946d5fb8 100644 --- a/Sources/Overload/OvUI/src/OvUI/Internal/WidgetContainer.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Internal/WidgetContainer.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvUI/src/OvUI/Modules/Canvas.cpp b/Sources/Overload/OvUI/src/OvUI/Modules/Canvas.cpp index d04bad37..f134bcea 100644 --- a/Sources/Overload/OvUI/src/OvUI/Modules/Canvas.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Modules/Canvas.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Modules/Canvas.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Panels/APanel.cpp b/Sources/Overload/OvUI/src/OvUI/Panels/APanel.cpp index dcb95fdf..d845fc3a 100644 --- a/Sources/Overload/OvUI/src/OvUI/Panels/APanel.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Panels/APanel.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvUI/src/OvUI/Panels/APanelTransformable.cpp b/Sources/Overload/OvUI/src/OvUI/Panels/APanelTransformable.cpp index 8d5ea637..52a9747c 100644 --- a/Sources/Overload/OvUI/src/OvUI/Panels/APanelTransformable.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Panels/APanelTransformable.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Panels/APanelTransformable.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Panels/PanelMenuBar.cpp b/Sources/Overload/OvUI/src/OvUI/Panels/PanelMenuBar.cpp index 172fc1a8..a4ce84d5 100644 --- a/Sources/Overload/OvUI/src/OvUI/Panels/PanelMenuBar.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Panels/PanelMenuBar.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Panels/PanelMenuBar.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Panels/PanelUndecorated.cpp b/Sources/Overload/OvUI/src/OvUI/Panels/PanelUndecorated.cpp index 0f13aa40..a7f55fea 100644 --- a/Sources/Overload/OvUI/src/OvUI/Panels/PanelUndecorated.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Panels/PanelUndecorated.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Panels/PanelUndecorated.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Panels/PanelWindow.cpp b/Sources/Overload/OvUI/src/OvUI/Panels/PanelWindow.cpp index 9327cf5c..dd7bbc73 100644 --- a/Sources/Overload/OvUI/src/OvUI/Panels/PanelWindow.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Panels/PanelWindow.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Panels/PanelWindow.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Plugins/ContextualMenu.cpp b/Sources/Overload/OvUI/src/OvUI/Plugins/ContextualMenu.cpp index 71d0fd50..f9d4732b 100644 --- a/Sources/Overload/OvUI/src/OvUI/Plugins/ContextualMenu.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Plugins/ContextualMenu.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Plugins/ContextualMenu.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Types/Color.cpp b/Sources/Overload/OvUI/src/OvUI/Types/Color.cpp index d5cfb1a4..9e519a6c 100644 --- a/Sources/Overload/OvUI/src/OvUI/Types/Color.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Types/Color.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Types/Color.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/AWidget.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/AWidget.cpp index 0bfa525f..601aca1a 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/AWidget.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/AWidget.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Widgets/AWidget.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/Buttons/Button.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/Buttons/Button.cpp index a677a58a..2b96d37e 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/Buttons/Button.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/Buttons/Button.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Widgets/Buttons/Button.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/Buttons/ButtonArrow.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/Buttons/ButtonArrow.cpp index 4d5cc1db..5ec25726 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/Buttons/ButtonArrow.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/Buttons/ButtonArrow.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Widgets/Buttons/ButtonArrow.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/Buttons/ButtonColored.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/Buttons/ButtonColored.cpp index 71314dc8..14aaa5c8 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/Buttons/ButtonColored.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/Buttons/ButtonColored.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Widgets/Buttons/ButtonColored.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/Buttons/ButtonImage.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/Buttons/ButtonImage.cpp index c27e37fe..646c2cea 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/Buttons/ButtonImage.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/Buttons/ButtonImage.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Widgets/Buttons/ButtonImage.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/Buttons/ButtonSmall.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/Buttons/ButtonSmall.cpp index 58b2ba6a..a7709ee8 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/Buttons/ButtonSmall.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/Buttons/ButtonSmall.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Internal/Converter.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/Drags/DragDouble.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/Drags/DragDouble.cpp index cd704124..70edc446 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/Drags/DragDouble.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/Drags/DragDouble.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Widgets/Drags/DragDouble.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/Drags/DragFloat.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/Drags/DragFloat.cpp index ef900e21..bdd15d0c 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/Drags/DragFloat.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/Drags/DragFloat.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Widgets/Drags/DragFloat.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/Drags/DragInt.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/Drags/DragInt.cpp index 9f23accf..fb694e57 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/Drags/DragInt.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/Drags/DragInt.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Widgets/Drags/DragInt.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/InputFields/InputDouble.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/InputFields/InputDouble.cpp index 9955eacf..c8222033 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/InputFields/InputDouble.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/InputFields/InputDouble.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Widgets/InputFields/InputDouble.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/InputFields/InputFloat.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/InputFields/InputFloat.cpp index 8e0d4b8a..d8d2cbe0 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/InputFields/InputFloat.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/InputFields/InputFloat.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Widgets/InputFields/InputFloat.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/InputFields/InputInt.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/InputFields/InputInt.cpp index fd2f03be..19d355aa 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/InputFields/InputInt.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/InputFields/InputInt.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Widgets/InputFields/InputInt.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/InputFields/InputText.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/InputFields/InputText.cpp index 6ef635d2..28010607 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/InputFields/InputText.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/InputFields/InputText.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Widgets/InputFields/InputText.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/Layout/Dummy.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/Layout/Dummy.cpp index 104bb77e..fc61a175 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/Layout/Dummy.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/Layout/Dummy.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Widgets/Layout/Dummy.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/Layout/Group.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/Layout/Group.cpp index 2077636e..51cf2f16 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/Layout/Group.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/Layout/Group.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Widgets/Layout/Group.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/Layout/GroupCollapsable.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/Layout/GroupCollapsable.cpp index 3ffbb6d8..1ce130ef 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/Layout/GroupCollapsable.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/Layout/GroupCollapsable.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Widgets/Layout/GroupCollapsable.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/Layout/NewLine.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/Layout/NewLine.cpp index 37d8a252..9893257d 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/Layout/NewLine.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/Layout/NewLine.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Widgets/Layout/NewLine.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/Layout/Spacing.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/Layout/Spacing.cpp index cb11be81..b5986487 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/Layout/Spacing.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/Layout/Spacing.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Widgets/Layout/Spacing.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/Layout/TreeNode.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/Layout/TreeNode.cpp index df18a792..8520d7fe 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/Layout/TreeNode.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/Layout/TreeNode.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Widgets/Layout/TreeNode.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/Menu/MenuItem.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/Menu/MenuItem.cpp index d09a88ce..6414bd43 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/Menu/MenuItem.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/Menu/MenuItem.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Widgets/Menu/MenuItem.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/Menu/MenuList.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/Menu/MenuList.cpp index 15f91493..ec473905 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/Menu/MenuList.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/Menu/MenuList.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Widgets/Menu/MenuList.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/Plots/APlot.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/Plots/APlot.cpp index 3a69b857..47a8505d 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/Plots/APlot.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/Plots/APlot.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Widgets/Plots/APlot.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/Plots/PlotHistogram.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/Plots/PlotHistogram.cpp index 74ce1c56..4afcb239 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/Plots/PlotHistogram.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/Plots/PlotHistogram.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Widgets/Plots/PlotHistogram.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/Plots/PlotLines.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/Plots/PlotLines.cpp index 68c3fba1..082a57f2 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/Plots/PlotLines.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/Plots/PlotLines.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Widgets/Plots/PlotLines.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/Selection/CheckBox.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/Selection/CheckBox.cpp index 68b05c76..4312656f 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/Selection/CheckBox.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/Selection/CheckBox.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Widgets/Selection/CheckBox.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/Selection/ColorEdit.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/Selection/ColorEdit.cpp index fb650b05..625c0136 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/Selection/ColorEdit.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/Selection/ColorEdit.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Widgets/Selection/ColorEdit.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/Selection/ColorPicker.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/Selection/ColorPicker.cpp index 843669f9..296b2eb6 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/Selection/ColorPicker.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/Selection/ColorPicker.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Widgets/Selection/ColorPicker.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/Selection/ComboBox.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/Selection/ComboBox.cpp index 9453b0b5..ba789db2 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/Selection/ComboBox.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/Selection/ComboBox.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/Selection/RadioButton.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/Selection/RadioButton.cpp index bac6cac7..1cdc3c7c 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/Selection/RadioButton.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/Selection/RadioButton.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Widgets/Selection/RadioButton.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/Selection/RadioButtonLinker.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/Selection/RadioButtonLinker.cpp index 59162f12..4ea6c765 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/Selection/RadioButtonLinker.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/Selection/RadioButtonLinker.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/Sliders/SliderDouble.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/Sliders/SliderDouble.cpp index 4f13bcec..e5240c53 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/Sliders/SliderDouble.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/Sliders/SliderDouble.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Widgets/Sliders/SliderDouble.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/Sliders/SliderFloat.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/Sliders/SliderFloat.cpp index a6d2d03c..b5844d0f 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/Sliders/SliderFloat.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/Sliders/SliderFloat.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Widgets/Sliders/SliderFloat.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/Sliders/SliderInt.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/Sliders/SliderInt.cpp index cbe6685e..414ffdc3 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/Sliders/SliderInt.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/Sliders/SliderInt.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Widgets/Sliders/SliderInt.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/Texts/Text.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/Texts/Text.cpp index 0621728a..131b03a7 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/Texts/Text.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/Texts/Text.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Widgets/Texts/Text.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/Texts/TextClickable.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/Texts/TextClickable.cpp index 94f9128f..47d73d9a 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/Texts/TextClickable.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/Texts/TextClickable.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Widgets/Texts/TextClickable.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/Texts/TextColored.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/Texts/TextColored.cpp index 5cb99759..ca3b9e17 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/Texts/TextColored.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/Texts/TextColored.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Widgets/Texts/TextColored.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/Texts/TextDisabled.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/Texts/TextDisabled.cpp index 97e11df2..d3a6b46f 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/Texts/TextDisabled.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/Texts/TextDisabled.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Widgets/Texts/TextDisabled.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/Texts/TextLabelled.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/Texts/TextLabelled.cpp index 27887e30..183a2176 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/Texts/TextLabelled.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/Texts/TextLabelled.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Widgets/Texts/TextLabelled.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/Texts/TextSelectable.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/Texts/TextSelectable.cpp index a32251ac..0ed8a3a7 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/Texts/TextSelectable.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/Texts/TextSelectable.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Widgets/Texts/TextSelectable.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/Texts/TextWrapped.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/Texts/TextWrapped.cpp index 6cb68009..5b559f81 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/Texts/TextWrapped.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/Texts/TextWrapped.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Widgets/Texts/TextWrapped.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/Visual/Bullet.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/Visual/Bullet.cpp index ce6cf634..2a08a087 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/Visual/Bullet.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/Visual/Bullet.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Widgets/Visual/Bullet.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/Visual/Image.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/Visual/Image.cpp index c9805164..54178b70 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/Visual/Image.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/Visual/Image.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Widgets/Visual/Image.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/Visual/ProgressBar.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/Visual/ProgressBar.cpp index 36a1eac4..db8b8e3b 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/Visual/ProgressBar.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/Visual/ProgressBar.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Widgets/Visual/ProgressBar.h" diff --git a/Sources/Overload/OvUI/src/OvUI/Widgets/Visual/Separator.cpp b/Sources/Overload/OvUI/src/OvUI/Widgets/Visual/Separator.cpp index a8ed6952..0f3271e9 100644 --- a/Sources/Overload/OvUI/src/OvUI/Widgets/Visual/Separator.cpp +++ b/Sources/Overload/OvUI/src/OvUI/Widgets/Visual/Separator.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvUI/Widgets/Visual/Separator.h" diff --git a/Sources/Overload/OvWindowing/include/OvWindowing/API/Export.h b/Sources/Overload/OvWindowing/include/OvWindowing/API/Export.h index 2daf0010..ebde2339 100644 --- a/Sources/Overload/OvWindowing/include/OvWindowing/API/Export.h +++ b/Sources/Overload/OvWindowing/include/OvWindowing/API/Export.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvWindowing/include/OvWindowing/Context/Device.h b/Sources/Overload/OvWindowing/include/OvWindowing/Context/Device.h index d90ae846..4544f203 100644 --- a/Sources/Overload/OvWindowing/include/OvWindowing/Context/Device.h +++ b/Sources/Overload/OvWindowing/include/OvWindowing/Context/Device.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvWindowing/include/OvWindowing/Context/EDeviceError.h b/Sources/Overload/OvWindowing/include/OvWindowing/Context/EDeviceError.h index 6fd2eebe..624cc381 100644 --- a/Sources/Overload/OvWindowing/include/OvWindowing/Context/EDeviceError.h +++ b/Sources/Overload/OvWindowing/include/OvWindowing/Context/EDeviceError.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvWindowing/include/OvWindowing/Cursor/ECursorMode.h b/Sources/Overload/OvWindowing/include/OvWindowing/Cursor/ECursorMode.h index 182b63ef..2c580600 100644 --- a/Sources/Overload/OvWindowing/include/OvWindowing/Cursor/ECursorMode.h +++ b/Sources/Overload/OvWindowing/include/OvWindowing/Cursor/ECursorMode.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvWindowing/include/OvWindowing/Cursor/ECursorShape.h b/Sources/Overload/OvWindowing/include/OvWindowing/Cursor/ECursorShape.h index 55d03517..d92e0229 100644 --- a/Sources/Overload/OvWindowing/include/OvWindowing/Cursor/ECursorShape.h +++ b/Sources/Overload/OvWindowing/include/OvWindowing/Cursor/ECursorShape.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvWindowing/include/OvWindowing/Dialogs/FileDialog.h b/Sources/Overload/OvWindowing/include/OvWindowing/Dialogs/FileDialog.h index 45773778..de557a55 100644 --- a/Sources/Overload/OvWindowing/include/OvWindowing/Dialogs/FileDialog.h +++ b/Sources/Overload/OvWindowing/include/OvWindowing/Dialogs/FileDialog.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvWindowing/include/OvWindowing/Dialogs/MessageBox.h b/Sources/Overload/OvWindowing/include/OvWindowing/Dialogs/MessageBox.h index e04b846c..942f39da 100644 --- a/Sources/Overload/OvWindowing/include/OvWindowing/Dialogs/MessageBox.h +++ b/Sources/Overload/OvWindowing/include/OvWindowing/Dialogs/MessageBox.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvWindowing/include/OvWindowing/Dialogs/OpenFileDialog.h b/Sources/Overload/OvWindowing/include/OvWindowing/Dialogs/OpenFileDialog.h index 1089e1fb..6142c180 100644 --- a/Sources/Overload/OvWindowing/include/OvWindowing/Dialogs/OpenFileDialog.h +++ b/Sources/Overload/OvWindowing/include/OvWindowing/Dialogs/OpenFileDialog.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvWindowing/include/OvWindowing/Dialogs/SaveFileDialog.h b/Sources/Overload/OvWindowing/include/OvWindowing/Dialogs/SaveFileDialog.h index 26ba3c11..1c3f4c54 100644 --- a/Sources/Overload/OvWindowing/include/OvWindowing/Dialogs/SaveFileDialog.h +++ b/Sources/Overload/OvWindowing/include/OvWindowing/Dialogs/SaveFileDialog.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvWindowing/include/OvWindowing/Inputs/EKey.h b/Sources/Overload/OvWindowing/include/OvWindowing/Inputs/EKey.h index 05c1fcd9..c6e17224 100644 --- a/Sources/Overload/OvWindowing/include/OvWindowing/Inputs/EKey.h +++ b/Sources/Overload/OvWindowing/include/OvWindowing/Inputs/EKey.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvWindowing/include/OvWindowing/Inputs/EKeyState.h b/Sources/Overload/OvWindowing/include/OvWindowing/Inputs/EKeyState.h index 3bef705c..4f35f00f 100644 --- a/Sources/Overload/OvWindowing/include/OvWindowing/Inputs/EKeyState.h +++ b/Sources/Overload/OvWindowing/include/OvWindowing/Inputs/EKeyState.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvWindowing/include/OvWindowing/Inputs/EMouseButton.h b/Sources/Overload/OvWindowing/include/OvWindowing/Inputs/EMouseButton.h index b636e3de..6171f210 100644 --- a/Sources/Overload/OvWindowing/include/OvWindowing/Inputs/EMouseButton.h +++ b/Sources/Overload/OvWindowing/include/OvWindowing/Inputs/EMouseButton.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvWindowing/include/OvWindowing/Inputs/EMouseButtonState.h b/Sources/Overload/OvWindowing/include/OvWindowing/Inputs/EMouseButtonState.h index d195109a..9803249c 100644 --- a/Sources/Overload/OvWindowing/include/OvWindowing/Inputs/EMouseButtonState.h +++ b/Sources/Overload/OvWindowing/include/OvWindowing/Inputs/EMouseButtonState.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvWindowing/include/OvWindowing/Inputs/InputManager.h b/Sources/Overload/OvWindowing/include/OvWindowing/Inputs/InputManager.h index b3268123..66f20930 100644 --- a/Sources/Overload/OvWindowing/include/OvWindowing/Inputs/InputManager.h +++ b/Sources/Overload/OvWindowing/include/OvWindowing/Inputs/InputManager.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvWindowing/include/OvWindowing/Settings/DeviceSettings.h b/Sources/Overload/OvWindowing/include/OvWindowing/Settings/DeviceSettings.h index 87e49286..aef4c687 100644 --- a/Sources/Overload/OvWindowing/include/OvWindowing/Settings/DeviceSettings.h +++ b/Sources/Overload/OvWindowing/include/OvWindowing/Settings/DeviceSettings.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvWindowing/include/OvWindowing/Settings/WindowSettings.h b/Sources/Overload/OvWindowing/include/OvWindowing/Settings/WindowSettings.h index 310e0154..17e50389 100644 --- a/Sources/Overload/OvWindowing/include/OvWindowing/Settings/WindowSettings.h +++ b/Sources/Overload/OvWindowing/include/OvWindowing/Settings/WindowSettings.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvWindowing/include/OvWindowing/Window.h b/Sources/Overload/OvWindowing/include/OvWindowing/Window.h index a2c18387..6665f4b8 100644 --- a/Sources/Overload/OvWindowing/include/OvWindowing/Window.h +++ b/Sources/Overload/OvWindowing/include/OvWindowing/Window.h @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #pragma once diff --git a/Sources/Overload/OvWindowing/src/OvWindowing/Context/Device.cpp b/Sources/Overload/OvWindowing/src/OvWindowing/Context/Device.cpp index a8fa161c..955c7cf7 100644 --- a/Sources/Overload/OvWindowing/src/OvWindowing/Context/Device.cpp +++ b/Sources/Overload/OvWindowing/src/OvWindowing/Context/Device.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvWindowing/Context/Device.h" diff --git a/Sources/Overload/OvWindowing/src/OvWindowing/Dialogs/FileDialog.cpp b/Sources/Overload/OvWindowing/src/OvWindowing/Dialogs/FileDialog.cpp index 797b8ec9..80f3e226 100644 --- a/Sources/Overload/OvWindowing/src/OvWindowing/Dialogs/FileDialog.cpp +++ b/Sources/Overload/OvWindowing/src/OvWindowing/Dialogs/FileDialog.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvWindowing/src/OvWindowing/Dialogs/MessageBox.cpp b/Sources/Overload/OvWindowing/src/OvWindowing/Dialogs/MessageBox.cpp index 8142afd0..3cab687c 100644 --- a/Sources/Overload/OvWindowing/src/OvWindowing/Dialogs/MessageBox.cpp +++ b/Sources/Overload/OvWindowing/src/OvWindowing/Dialogs/MessageBox.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvWindowing/src/OvWindowing/Dialogs/OpenFileDialog.cpp b/Sources/Overload/OvWindowing/src/OvWindowing/Dialogs/OpenFileDialog.cpp index eaa73db5..9f11dcd1 100644 --- a/Sources/Overload/OvWindowing/src/OvWindowing/Dialogs/OpenFileDialog.cpp +++ b/Sources/Overload/OvWindowing/src/OvWindowing/Dialogs/OpenFileDialog.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvWindowing/Dialogs/OpenFileDialog.h" diff --git a/Sources/Overload/OvWindowing/src/OvWindowing/Dialogs/SaveFileDialog.cpp b/Sources/Overload/OvWindowing/src/OvWindowing/Dialogs/SaveFileDialog.cpp index 23b6f993..04bc5720 100644 --- a/Sources/Overload/OvWindowing/src/OvWindowing/Dialogs/SaveFileDialog.cpp +++ b/Sources/Overload/OvWindowing/src/OvWindowing/Dialogs/SaveFileDialog.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include "OvWindowing/Dialogs/SaveFileDialog.h" diff --git a/Sources/Overload/OvWindowing/src/OvWindowing/Inputs/InputManager.cpp b/Sources/Overload/OvWindowing/src/OvWindowing/Inputs/InputManager.cpp index 9b2ca9e7..f902a8b9 100644 --- a/Sources/Overload/OvWindowing/src/OvWindowing/Inputs/InputManager.cpp +++ b/Sources/Overload/OvWindowing/src/OvWindowing/Inputs/InputManager.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include diff --git a/Sources/Overload/OvWindowing/src/OvWindowing/Window.cpp b/Sources/Overload/OvWindowing/src/OvWindowing/Window.cpp index 85c03b5f..26f325eb 100644 --- a/Sources/Overload/OvWindowing/src/OvWindowing/Window.cpp +++ b/Sources/Overload/OvWindowing/src/OvWindowing/Window.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include From 34e086820e3a1e1040b3fbd2b6449e12a8478d00 Mon Sep 17 00:00:00 2001 From: Adrien GIVRY Date: Tue, 7 Jan 2020 19:07:07 -0500 Subject: [PATCH 02/46] Create LICENSE --- LICENSE | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..28d8eedc --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2020 Overload Tech. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. From 9effb45fef8d4c49d802f12fa501825280866850 Mon Sep 17 00:00:00 2001 From: Adrien GIVRY Date: Tue, 7 Jan 2020 19:10:01 -0500 Subject: [PATCH 03/46] Fixing missing licence header --- Sources/Overload/OvEditor/src/OvEditor/Core/Application.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/Overload/OvEditor/src/OvEditor/Core/Application.cpp b/Sources/Overload/OvEditor/src/OvEditor/Core/Application.cpp index a13fde3a..f6a62fda 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Core/Application.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Core/Application.cpp @@ -1,7 +1,7 @@ /** * @project: Overload * @author: Overload Tech. -* @restrictions: This software may not be resold, redistributed or otherwise conveyed to a third party. +* @licence: MIT */ #include From dc7a59ea21e30f7a954ffa5c82727e1cbf773a5e Mon Sep 17 00:00:00 2001 From: KoltunDmitry Date: Sun, 23 Feb 2020 11:46:57 +0300 Subject: [PATCH 04/46] fix build error --- Sources/Overload/OvEditor/include/OvEditor/Core/PanelsManager.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Sources/Overload/OvEditor/include/OvEditor/Core/PanelsManager.h b/Sources/Overload/OvEditor/include/OvEditor/Core/PanelsManager.h index e8038a59..2ef5fa5f 100644 --- a/Sources/Overload/OvEditor/include/OvEditor/Core/PanelsManager.h +++ b/Sources/Overload/OvEditor/include/OvEditor/Core/PanelsManager.h @@ -8,7 +8,9 @@ #include +#include "OvEditor/Panels/MenuBar.h" #include "OvUI/Panels/APanel.h" +#include "OvUI/Panels/PanelWindow.h" #include "OvUI/Modules/Canvas.h" namespace OvEditor::Core From 89d2a20d779b455fc5688b64b19eab71e588326c Mon Sep 17 00:00:00 2001 From: Adrien GIVRY Date: Fri, 28 Feb 2020 00:25:00 -0500 Subject: [PATCH 05/46] Adding texture and model metadata customization When an asset is loaded into Overload using a resource manager (Ex: TextureManager, ModelManager), a set of default settings were used. These settings are likely to get customized by the user. In order to specify loading data for any texture/model, a .meta file support has been added. Depending on the file type, the .meta file will indicate how to load the asset. The editor has been expanded to support .meta file generation and modification, (Asset, right click, Edit metadata). Model can now be dynamically reloaded at runtime. --- .../OvAudio/Resources/Loaders/SoundLoader.h | 7 + .../OvAudio/Resources/Loaders/SoundLoader.cpp | 5 + .../ResourceManagement/AResourceManager.h | 7 + .../ResourceManagement/AResourceManager.inl | 9 + .../ResourceManagement/MaterialManager.h | 7 + .../OvCore/ResourceManagement/ModelManager.h | 7 + .../OvCore/ResourceManagement/ShaderManager.h | 7 + .../OvCore/ResourceManagement/SoundManager.h | 7 + .../ResourceManagement/TextureManager.h | 7 + .../ResourceManagement/MaterialManager.cpp | 5 + .../ResourceManagement/ModelManager.cpp | 57 +++-- .../ResourceManagement/ShaderManager.cpp | 5 + .../ResourceManagement/SoundManager.cpp | 4 + .../ResourceManagement/TextureManager.cpp | 30 ++- Sources/Overload/OvEditor/OvEditor.vcxproj | 2 + .../OvEditor/OvEditor.vcxproj.filters | 6 + .../OvEditor/Panels/AssetMetadataEditor.h | 65 +++++ Sources/Overload/OvEditor/layout.ini | 14 +- .../OvEditor/src/OvEditor/Core/Editor.cpp | 2 + .../src/OvEditor/Panels/AssetBrowser.cpp | 51 +++- .../OvEditor/Panels/AssetMetadataEditor.cpp | 233 ++++++++++++++++++ .../Resources/Loaders/ModelLoader.h | 8 + .../Resources/Loaders/TextureLoader.h | 5 +- .../Resources/Loaders/ModelLoader.cpp | 13 + .../Resources/Loaders/TextureLoader.cpp | 4 +- .../include/OvTools/Filesystem/IniFile.h | 9 + .../include/OvTools/Filesystem/IniFile.inl | 6 + 27 files changed, 552 insertions(+), 30 deletions(-) create mode 100644 Sources/Overload/OvEditor/include/OvEditor/Panels/AssetMetadataEditor.h create mode 100644 Sources/Overload/OvEditor/src/OvEditor/Panels/AssetMetadataEditor.cpp diff --git a/Sources/Overload/OvAudio/include/OvAudio/Resources/Loaders/SoundLoader.h b/Sources/Overload/OvAudio/include/OvAudio/Resources/Loaders/SoundLoader.h index f1068dd5..d1de8126 100644 --- a/Sources/Overload/OvAudio/include/OvAudio/Resources/Loaders/SoundLoader.h +++ b/Sources/Overload/OvAudio/include/OvAudio/Resources/Loaders/SoundLoader.h @@ -29,6 +29,13 @@ namespace OvAudio::Resources::Loaders */ static Sound* Create(const std::string& p_filepath); + /** + * Reload a sound + * @param p_sound + * @param p_path + */ + static void Reload(Sound& p_sound, const std::string& p_path); + /** * Destroy a sound * @param p_soundInstance diff --git a/Sources/Overload/OvAudio/src/OvAudio/Resources/Loaders/SoundLoader.cpp b/Sources/Overload/OvAudio/src/OvAudio/Resources/Loaders/SoundLoader.cpp index 70231245..956975dc 100644 --- a/Sources/Overload/OvAudio/src/OvAudio/Resources/Loaders/SoundLoader.cpp +++ b/Sources/Overload/OvAudio/src/OvAudio/Resources/Loaders/SoundLoader.cpp @@ -11,6 +11,11 @@ OvAudio::Resources::Sound* OvAudio::Resources::Loaders::SoundLoader::Create(cons return new Sound(p_filepath); } +void OvAudio::Resources::Loaders::SoundLoader::Reload(Sound& p_sound, const std::string& p_path) +{ + *const_cast(&p_sound.path) = p_path; +} + bool OvAudio::Resources::Loaders::SoundLoader::Destroy(Sound*& p_soundInstance) { if (p_soundInstance) diff --git a/Sources/Overload/OvCore/include/OvCore/ResourceManagement/AResourceManager.h b/Sources/Overload/OvCore/include/OvCore/ResourceManagement/AResourceManager.h index a3acff28..53275443 100644 --- a/Sources/Overload/OvCore/include/OvCore/ResourceManagement/AResourceManager.h +++ b/Sources/Overload/OvCore/include/OvCore/ResourceManagement/AResourceManager.h @@ -39,6 +39,12 @@ namespace OvCore::ResourceManagement */ bool MoveResource(const std::string& p_previousPath, const std::string& p_newPath); + /** + * Reload a resource + * @param p_path + */ + void ReloadResource(const std::string& p_path); + /** * Return true if the resource exists (= Is registered) * @param p_path @@ -97,6 +103,7 @@ namespace OvCore::ResourceManagement protected: virtual T* CreateResource(const std::string& p_path) = 0; virtual void DestroyResource(T* p_resource) = 0; + virtual void ReloadResource(T* p_resource, const std::string& p_path) = 0; std::string GetRealPath(const std::string& p_path) const; private: diff --git a/Sources/Overload/OvCore/include/OvCore/ResourceManagement/AResourceManager.inl b/Sources/Overload/OvCore/include/OvCore/ResourceManagement/AResourceManager.inl index 2ca50f1b..62d76479 100644 --- a/Sources/Overload/OvCore/include/OvCore/ResourceManagement/AResourceManager.inl +++ b/Sources/Overload/OvCore/include/OvCore/ResourceManagement/AResourceManager.inl @@ -51,6 +51,15 @@ namespace OvCore::ResourceManagement return false; } + template + inline void AResourceManager::ReloadResource(const std::string& p_path) + { + if (auto resource = GetResource(p_path, false); resource) + { + ReloadResource(resource, p_path); + } + } + template inline bool AResourceManager::IsResourceRegistered(const std::string & p_path) { diff --git a/Sources/Overload/OvCore/include/OvCore/ResourceManagement/MaterialManager.h b/Sources/Overload/OvCore/include/OvCore/ResourceManagement/MaterialManager.h index 64537fbb..198774e1 100644 --- a/Sources/Overload/OvCore/include/OvCore/ResourceManagement/MaterialManager.h +++ b/Sources/Overload/OvCore/include/OvCore/ResourceManagement/MaterialManager.h @@ -28,5 +28,12 @@ namespace OvCore::ResourceManagement * @param p_resource */ virtual void DestroyResource(OvCore::Resources::Material* p_resource) override; + + /** + * Reload the given resource + * @param p_resource + * @param p_path + */ + virtual void ReloadResource(OvCore::Resources::Material* p_resource, const std::string& p_path) override; }; } \ No newline at end of file diff --git a/Sources/Overload/OvCore/include/OvCore/ResourceManagement/ModelManager.h b/Sources/Overload/OvCore/include/OvCore/ResourceManagement/ModelManager.h index 5b181c86..74c22b6f 100644 --- a/Sources/Overload/OvCore/include/OvCore/ResourceManagement/ModelManager.h +++ b/Sources/Overload/OvCore/include/OvCore/ResourceManagement/ModelManager.h @@ -29,5 +29,12 @@ namespace OvCore::ResourceManagement * @param p_resource */ virtual void DestroyResource(OvRendering::Resources::Model* p_resource) override; + + /** + * Reload the given resource + * @param p_resource + * @param p_path + */ + virtual void ReloadResource(OvRendering::Resources::Model* p_resource, const std::string& p_path) override; }; } \ No newline at end of file diff --git a/Sources/Overload/OvCore/include/OvCore/ResourceManagement/ShaderManager.h b/Sources/Overload/OvCore/include/OvCore/ResourceManagement/ShaderManager.h index 37265777..5984a450 100644 --- a/Sources/Overload/OvCore/include/OvCore/ResourceManagement/ShaderManager.h +++ b/Sources/Overload/OvCore/include/OvCore/ResourceManagement/ShaderManager.h @@ -29,5 +29,12 @@ namespace OvCore::ResourceManagement * @param p_resource */ virtual void DestroyResource(OvRendering::Resources::Shader* p_resource) override; + + /** + * Reload the given resource + * @param p_resource + * @param p_path + */ + virtual void ReloadResource(OvRendering::Resources::Shader* p_resource, const std::string& p_path) override; }; } \ No newline at end of file diff --git a/Sources/Overload/OvCore/include/OvCore/ResourceManagement/SoundManager.h b/Sources/Overload/OvCore/include/OvCore/ResourceManagement/SoundManager.h index c8282404..7f23e30c 100644 --- a/Sources/Overload/OvCore/include/OvCore/ResourceManagement/SoundManager.h +++ b/Sources/Overload/OvCore/include/OvCore/ResourceManagement/SoundManager.h @@ -29,5 +29,12 @@ namespace OvCore::ResourceManagement * @param p_resource */ virtual void DestroyResource(OvAudio::Resources::Sound* p_resource) override; + + /** + * Reload the given resource + * @param p_resource + * @param p_path + */ + virtual void ReloadResource(OvAudio::Resources::Sound* p_resource, const std::string& p_path) override; }; } \ No newline at end of file diff --git a/Sources/Overload/OvCore/include/OvCore/ResourceManagement/TextureManager.h b/Sources/Overload/OvCore/include/OvCore/ResourceManagement/TextureManager.h index f9d52562..1d253856 100644 --- a/Sources/Overload/OvCore/include/OvCore/ResourceManagement/TextureManager.h +++ b/Sources/Overload/OvCore/include/OvCore/ResourceManagement/TextureManager.h @@ -29,5 +29,12 @@ namespace OvCore::ResourceManagement * @param p_resource */ virtual void DestroyResource(OvRendering::Resources::Texture* p_resource) override; + + /** + * Reload the given resource + * @param p_resource + * @param p_path + */ + virtual void ReloadResource(OvRendering::Resources::Texture* p_resource, const std::string& p_path) override; }; } \ No newline at end of file diff --git a/Sources/Overload/OvCore/src/OvCore/ResourceManagement/MaterialManager.cpp b/Sources/Overload/OvCore/src/OvCore/ResourceManagement/MaterialManager.cpp index 156d8ca6..7368601e 100644 --- a/Sources/Overload/OvCore/src/OvCore/ResourceManagement/MaterialManager.cpp +++ b/Sources/Overload/OvCore/src/OvCore/ResourceManagement/MaterialManager.cpp @@ -23,3 +23,8 @@ void OvCore::ResourceManagement::MaterialManager::DestroyResource(OvCore::Resour { OvCore::Resources::Loaders::MaterialLoader::Destroy(p_resource); } + +void OvCore::ResourceManagement::MaterialManager::ReloadResource(OvCore::Resources::Material* p_resource, const std::string& p_path) +{ + OvCore::Resources::Loaders::MaterialLoader::Reload(*p_resource, p_path); +} diff --git a/Sources/Overload/OvCore/src/OvCore/ResourceManagement/ModelManager.cpp b/Sources/Overload/OvCore/src/OvCore/ResourceManagement/ModelManager.cpp index b1d1668f..013d998d 100644 --- a/Sources/Overload/OvCore/src/OvCore/ResourceManagement/ModelManager.cpp +++ b/Sources/Overload/OvCore/src/OvCore/ResourceManagement/ModelManager.cpp @@ -6,25 +6,48 @@ #include "OvCore/ResourceManagement/ModelManager.h" -OvRendering::Resources::Model* OvCore::ResourceManagement::ModelManager::CreateResource(const std::string& p_path) +#include + +OvRendering::Resources::Parsers::EModelParserFlags GetAssetMetadata(const std::string& p_path) { + auto metaFile = OvTools::Filesystem::IniFile(p_path + ".meta"); + OvRendering::Resources::Parsers::EModelParserFlags flags = OvRendering::Resources::Parsers::EModelParserFlags::NONE; - flags |= OvRendering::Resources::Parsers::EModelParserFlags::TRIANGULATE; - flags |= OvRendering::Resources::Parsers::EModelParserFlags::GEN_SMOOTH_NORMALS; - flags |= OvRendering::Resources::Parsers::EModelParserFlags::OPTIMIZE_MESHES; - flags |= OvRendering::Resources::Parsers::EModelParserFlags::OPTIMIZE_GRAPH; - flags |= OvRendering::Resources::Parsers::EModelParserFlags::FIND_INSTANCES; - flags |= OvRendering::Resources::Parsers::EModelParserFlags::CALC_TANGENT_SPACE; - flags |= OvRendering::Resources::Parsers::EModelParserFlags::JOIN_IDENTICAL_VERTICES; - flags |= OvRendering::Resources::Parsers::EModelParserFlags::DEBONE; - flags |= OvRendering::Resources::Parsers::EModelParserFlags::FIND_INVALID_DATA; - flags |= OvRendering::Resources::Parsers::EModelParserFlags::IMPROVE_CACHE_LOCALITY; - flags |= OvRendering::Resources::Parsers::EModelParserFlags::GEN_UV_COORDS; - flags |= OvRendering::Resources::Parsers::EModelParserFlags::PRE_TRANSFORM_VERTICES; + if (metaFile.GetOrDefault("CALC_TANGENT_SPACE", true)) flags |= OvRendering::Resources::Parsers::EModelParserFlags::CALC_TANGENT_SPACE; + if (metaFile.GetOrDefault("JOIN_IDENTICAL_VERTICES", true)) flags |= OvRendering::Resources::Parsers::EModelParserFlags::JOIN_IDENTICAL_VERTICES; + if (metaFile.GetOrDefault("MAKE_LEFT_HANDED", false)) flags |= OvRendering::Resources::Parsers::EModelParserFlags::MAKE_LEFT_HANDED; + if (metaFile.GetOrDefault("TRIANGULATE", true)) flags |= OvRendering::Resources::Parsers::EModelParserFlags::TRIANGULATE; + if (metaFile.GetOrDefault("REMOVE_COMPONENT", false)) flags |= OvRendering::Resources::Parsers::EModelParserFlags::REMOVE_COMPONENT; + if (metaFile.GetOrDefault("GEN_NORMALS", false)) flags |= OvRendering::Resources::Parsers::EModelParserFlags::GEN_NORMALS; + if (metaFile.GetOrDefault("GEN_SMOOTH_NORMALS", true)) flags |= OvRendering::Resources::Parsers::EModelParserFlags::GEN_SMOOTH_NORMALS; + if (metaFile.GetOrDefault("SPLIT_LARGE_MESHES", false)) flags |= OvRendering::Resources::Parsers::EModelParserFlags::SPLIT_LARGE_MESHES; + if (metaFile.GetOrDefault("PRE_TRANSFORM_VERTICES", true)) flags |= OvRendering::Resources::Parsers::EModelParserFlags::PRE_TRANSFORM_VERTICES; + if (metaFile.GetOrDefault("LIMIT_BONE_WEIGHTS", false)) flags |= OvRendering::Resources::Parsers::EModelParserFlags::LIMIT_BONE_WEIGHTS; + if (metaFile.GetOrDefault("VALIDATE_DATA_STRUCTURE", false)) flags |= OvRendering::Resources::Parsers::EModelParserFlags::VALIDATE_DATA_STRUCTURE; + if (metaFile.GetOrDefault("IMPROVE_CACHE_LOCALITY", true)) flags |= OvRendering::Resources::Parsers::EModelParserFlags::IMPROVE_CACHE_LOCALITY; + if (metaFile.GetOrDefault("REMOVE_REDUNDANT_MATERIALS", false)) flags |= OvRendering::Resources::Parsers::EModelParserFlags::REMOVE_REDUNDANT_MATERIALS; + if (metaFile.GetOrDefault("FIX_INFACING_NORMALS", false)) flags |= OvRendering::Resources::Parsers::EModelParserFlags::FIX_INFACING_NORMALS; + if (metaFile.GetOrDefault("SORT_BY_PTYPE", false)) flags |= OvRendering::Resources::Parsers::EModelParserFlags::SORT_BY_PTYPE; + if (metaFile.GetOrDefault("FIND_DEGENERATES", false)) flags |= OvRendering::Resources::Parsers::EModelParserFlags::FIND_DEGENERATES; + if (metaFile.GetOrDefault("FIND_INVALID_DATA", true)) flags |= OvRendering::Resources::Parsers::EModelParserFlags::FIND_INVALID_DATA; + if (metaFile.GetOrDefault("GEN_UV_COORDS", true)) flags |= OvRendering::Resources::Parsers::EModelParserFlags::GEN_UV_COORDS; + if (metaFile.GetOrDefault("TRANSFORM_UV_COORDS", false)) flags |= OvRendering::Resources::Parsers::EModelParserFlags::TRANSFORM_UV_COORDS; + if (metaFile.GetOrDefault("FIND_INSTANCES", true)) flags |= OvRendering::Resources::Parsers::EModelParserFlags::FIND_INSTANCES; + if (metaFile.GetOrDefault("OPTIMIZE_MESHES", true)) flags |= OvRendering::Resources::Parsers::EModelParserFlags::OPTIMIZE_MESHES; + if (metaFile.GetOrDefault("OPTIMIZE_GRAPH", true)) flags |= OvRendering::Resources::Parsers::EModelParserFlags::OPTIMIZE_GRAPH; + if (metaFile.GetOrDefault("FLIP_UVS", false)) flags |= OvRendering::Resources::Parsers::EModelParserFlags::FLIP_UVS; + if (metaFile.GetOrDefault("FLIP_WINDING_ORDER", false)) flags |= OvRendering::Resources::Parsers::EModelParserFlags::FLIP_WINDING_ORDER; + if (metaFile.GetOrDefault("SPLIT_BY_BONE_COUNT", false)) flags |= OvRendering::Resources::Parsers::EModelParserFlags::SPLIT_BY_BONE_COUNT; + if (metaFile.GetOrDefault("DEBONE", true)) flags |= OvRendering::Resources::Parsers::EModelParserFlags::DEBONE; + return { flags }; +} + +OvRendering::Resources::Model* OvCore::ResourceManagement::ModelManager::CreateResource(const std::string& p_path) +{ std::string realPath = GetRealPath(p_path); - auto model = OvRendering::Resources::Loaders::ModelLoader::Create(realPath, flags); + auto model = OvRendering::Resources::Loaders::ModelLoader::Create(realPath, GetAssetMetadata(realPath)); if (model) *reinterpret_cast(reinterpret_cast(model) + offsetof(OvRendering::Resources::Model, path)) = p_path; // Force the resource path to fit the given path @@ -35,3 +58,9 @@ void OvCore::ResourceManagement::ModelManager::DestroyResource(OvRendering::Reso { OvRendering::Resources::Loaders::ModelLoader::Destroy(p_resource); } + +void OvCore::ResourceManagement::ModelManager::ReloadResource(OvRendering::Resources::Model* p_resource, const std::string& p_path) +{ + std::string realPath = GetRealPath(p_path); + OvRendering::Resources::Loaders::ModelLoader::Reload(*p_resource, realPath, GetAssetMetadata(realPath)); +} diff --git a/Sources/Overload/OvCore/src/OvCore/ResourceManagement/ShaderManager.cpp b/Sources/Overload/OvCore/src/OvCore/ResourceManagement/ShaderManager.cpp index 27f34a36..3e06beff 100644 --- a/Sources/Overload/OvCore/src/OvCore/ResourceManagement/ShaderManager.cpp +++ b/Sources/Overload/OvCore/src/OvCore/ResourceManagement/ShaderManager.cpp @@ -20,3 +20,8 @@ void OvCore::ResourceManagement::ShaderManager::DestroyResource(OvRendering::Res { OvRendering::Resources::Loaders::ShaderLoader::Destroy(p_resource); } + +void OvCore::ResourceManagement::ShaderManager::ReloadResource(OvRendering::Resources::Shader* p_resource, const std::string& p_path) +{ + OvRendering::Resources::Loaders::ShaderLoader::Recompile(*p_resource, p_path); +} diff --git a/Sources/Overload/OvCore/src/OvCore/ResourceManagement/SoundManager.cpp b/Sources/Overload/OvCore/src/OvCore/ResourceManagement/SoundManager.cpp index 57ace773..fc14380e 100644 --- a/Sources/Overload/OvCore/src/OvCore/ResourceManagement/SoundManager.cpp +++ b/Sources/Overload/OvCore/src/OvCore/ResourceManagement/SoundManager.cpp @@ -20,3 +20,7 @@ void OvCore::ResourceManagement::SoundManager::DestroyResource(OvAudio::Resource { OvAudio::Resources::Loaders::SoundLoader::Destroy(p_resource); } + +void OvCore::ResourceManagement::SoundManager::ReloadResource(OvAudio::Resources::Sound* p_resource, const std::string& p_path) +{ +} diff --git a/Sources/Overload/OvCore/src/OvCore/ResourceManagement/TextureManager.cpp b/Sources/Overload/OvCore/src/OvCore/ResourceManagement/TextureManager.cpp index 027cf46f..cafc5df0 100644 --- a/Sources/Overload/OvCore/src/OvCore/ResourceManagement/TextureManager.cpp +++ b/Sources/Overload/OvCore/src/OvCore/ResourceManagement/TextureManager.cpp @@ -7,13 +7,26 @@ #include "OvCore/ResourceManagement/TextureManager.h" #include "OvRendering/Settings/DriverSettings.h" -OvRendering::Resources::Texture* OvCore::ResourceManagement::TextureManager::CreateResource(const std::string & p_path) +#include + +std::tuple GetAssetMetadata(const std::string& p_path) { - OvRendering::Settings::ETextureFilteringMode firstFilter = OvRendering::Settings::ETextureFilteringMode::LINEAR_MIPMAP_LINEAR; - OvRendering::Settings::ETextureFilteringMode secondFilter = OvRendering::Settings::ETextureFilteringMode::LINEAR; + auto metaFile = OvTools::Filesystem::IniFile(p_path + ".meta"); + + auto min = metaFile.GetOrDefault("MIN_FILTER", static_cast(OvRendering::Settings::ETextureFilteringMode::LINEAR_MIPMAP_LINEAR)); + auto mag = metaFile.GetOrDefault("MAG_FILTER", static_cast(OvRendering::Settings::ETextureFilteringMode::LINEAR)); + auto mipmap = metaFile.GetOrDefault("ENABLE_MIPMAPPING", true); + + return { static_cast(min), static_cast(mag), mipmap }; +} +OvRendering::Resources::Texture* OvCore::ResourceManagement::TextureManager::CreateResource(const std::string & p_path) +{ std::string realPath = GetRealPath(p_path); - OvRendering::Resources::Texture* texture = OvRendering::Resources::Loaders::TextureLoader::Create(realPath, firstFilter, secondFilter, true); + + auto [min, mag, mipmap] = GetAssetMetadata(realPath); + + OvRendering::Resources::Texture* texture = OvRendering::Resources::Loaders::TextureLoader::Create(realPath, min, mag, mipmap); if (texture) *reinterpret_cast(reinterpret_cast(texture) + offsetof(OvRendering::Resources::Texture, path)) = p_path; // Force the resource path to fit the given path @@ -24,3 +37,12 @@ void OvCore::ResourceManagement::TextureManager::DestroyResource(OvRendering::Re { OvRendering::Resources::Loaders::TextureLoader::Destroy(p_resource); } + +void OvCore::ResourceManagement::TextureManager::ReloadResource(OvRendering::Resources::Texture* p_resource, const std::string& p_path) +{ + std::string realPath = GetRealPath(p_path); + + auto [min, mag, mipmap] = GetAssetMetadata(realPath); + + OvRendering::Resources::Loaders::TextureLoader::Reload(*p_resource, realPath, min, mag, mipmap); +} diff --git a/Sources/Overload/OvEditor/OvEditor.vcxproj b/Sources/Overload/OvEditor/OvEditor.vcxproj index ce444ef2..1e066a94 100644 --- a/Sources/Overload/OvEditor/OvEditor.vcxproj +++ b/Sources/Overload/OvEditor/OvEditor.vcxproj @@ -146,6 +146,7 @@ xcopy "$(ProjectDir)Layout.ini" "$(SolutionDir)..\..\Build\$(ProjectName)\$(Conf + @@ -176,6 +177,7 @@ xcopy "$(ProjectDir)Layout.ini" "$(SolutionDir)..\..\Build\$(ProjectName)\$(Conf + diff --git a/Sources/Overload/OvEditor/OvEditor.vcxproj.filters b/Sources/Overload/OvEditor/OvEditor.vcxproj.filters index 4f82f6ff..92004d30 100644 --- a/Sources/Overload/OvEditor/OvEditor.vcxproj.filters +++ b/Sources/Overload/OvEditor/OvEditor.vcxproj.filters @@ -102,6 +102,9 @@ Source Files + + Source Files + @@ -194,6 +197,9 @@ Header Files + + Header Files + diff --git a/Sources/Overload/OvEditor/include/OvEditor/Panels/AssetMetadataEditor.h b/Sources/Overload/OvEditor/include/OvEditor/Panels/AssetMetadataEditor.h new file mode 100644 index 00000000..ff4af7ae --- /dev/null +++ b/Sources/Overload/OvEditor/include/OvEditor/Panels/AssetMetadataEditor.h @@ -0,0 +1,65 @@ +/** +* @project: Overload +* @author: Overload Tech. +* @licence: MIT +*/ + +#pragma once + +#include + +#include + +#include +#include +#include +#include + +#include +#include + +namespace OvEditor::Panels +{ + class AssetMetadataEditor : public OvUI::Panels::PanelWindow + { + public: + using EditableAssets = std::variant; + + /** + * Constructor + * @param p_title + * @param p_opened + * @param p_windowSettings + */ + AssetMetadataEditor + ( + const std::string& p_title, + bool p_opened, + const OvUI::Settings::PanelWindowSettings& p_windowSettings + ); + + /** + * Defines the target of the asset settings editor + * @param p_path + */ + void SetTarget(const std::string& p_path); + + /** + * Launch the preview of the target asset + */ + void Preview(); + + private: + void CreateHeaderButtons(); + void CreateSettings(); + void CreateModelSettings(); + void CreateTextureSettings(); + void Apply(); + + private: + std::string m_resource; + + OvUI::Widgets::Layout::Columns<2>* m_settings = nullptr; + std::unique_ptr m_metadata; + }; +} \ No newline at end of file diff --git a/Sources/Overload/OvEditor/layout.ini b/Sources/Overload/OvEditor/layout.ini index 73edf0ec..d6addb88 100644 --- a/Sources/Overload/OvEditor/layout.ini +++ b/Sources/Overload/OvEditor/layout.ini @@ -67,8 +67,8 @@ Collapsed=0 DockId=0x3F20F338,1 [Window][Asset Browser##2] -Pos=0,331 -Size=311,696 +Pos=0,24 +Size=311,1003 Collapsed=0 DockId=0x00000014,0 @@ -233,6 +233,12 @@ Size=429,497 Collapsed=0 DockId=0x0000000D,1 +[Window][Asset Metadata Editor##15] +Pos=1491,24 +Size=429,497 +Collapsed=0 +DockId=0x0000000D,1 + [Docking][Data] DockSpace ID=0x3F20F338 Pos=0,24 Size=1920,1003 Split=X SelectedTab=0x110CC311 DockNode ID=0x00000023 Parent=0x3F20F338 SizeRef=1429,1363 Split=X @@ -264,8 +270,8 @@ DockSpace ID=0x3F20F338 Pos=0,24 Size=1920,1003 Split=X Se DockNode ID=0x00000007 Parent=0x00000004 SizeRef=360,409 SelectedTab=0x1ACA2EC4 DockNode ID=0x00000008 Parent=0x00000004 SizeRef=360,453 SelectedTab=0x0B0A0F09 DockNode ID=0x00000016 Parent=0x0000001A SizeRef=572,1363 Split=Y SelectedTab=0x92035EB3 - DockNode ID=0x0000000D Parent=0x00000016 SizeRef=215,676 SelectedTab=0x2DC8073C - DockNode ID=0x00000012 Parent=0x00000016 SizeRef=215,685 SelectedTab=0xF3932F03 + DockNode ID=0x0000000D Parent=0x00000016 SizeRef=215,676 SelectedTab=0xF242A481 + DockNode ID=0x00000012 Parent=0x00000016 SizeRef=215,685 SelectedTab=0x92035EB3 DockNode ID=0x00000024 Parent=0x3F20F338 SizeRef=489,1363 Split=Y SelectedTab=0xFD7203C3 DockNode ID=0x0000001D Parent=0x00000024 SizeRef=489,598 Split=Y SelectedTab=0xB3AC929F DockNode ID=0x00000025 Parent=0x0000001D SizeRef=489,301 SelectedTab=0xFD7203C3 diff --git a/Sources/Overload/OvEditor/src/OvEditor/Core/Editor.cpp b/Sources/Overload/OvEditor/src/OvEditor/Core/Editor.cpp index cb509faf..28a8ccc7 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Core/Editor.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Core/Editor.cpp @@ -22,6 +22,7 @@ #include "OvEditor/Panels/Toolbar.h" #include "OvEditor/Panels/MaterialEditor.h" #include "OvEditor/Panels/ProjectSettings.h" +#include "OvEditor/Panels/AssetMetadataEditor.h" using namespace OvCore::ResourceManagement; using namespace OvEditor::Panels; @@ -65,6 +66,7 @@ void OvEditor::Core::Editor::SetupUI() m_panelsManager.CreatePanel("Toolbar", true, settings); m_panelsManager.CreatePanel("Material Editor", false, settings); m_panelsManager.CreatePanel("Project Settings", false, settings); + m_panelsManager.CreatePanel("Asset Metadata Editor", false, settings); m_canvas.MakeDockspace(true); m_context.uiManager->SetCanvas(m_canvas); diff --git a/Sources/Overload/OvEditor/src/OvEditor/Panels/AssetBrowser.cpp b/Sources/Overload/OvEditor/src/OvEditor/Panels/AssetBrowser.cpp index 90b4fd00..c8bf5fac 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Panels/AssetBrowser.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Panels/AssetBrowser.cpp @@ -32,6 +32,7 @@ #include "OvEditor/Panels/AssetBrowser.h" #include "OvEditor/Panels/AssetView.h" #include "OvEditor/Panels/MaterialEditor.h" +#include "OvEditor/Panels/AssetMetadataEditor.h" #include "OvEditor/Core/EditorActions.h" #include "OvEditor/Core/EditorResources.h" @@ -653,6 +654,28 @@ class ModelContextualMenu : public PreviewableContextualMenu("Reload"); + + reloadAction.ClickedEvent += [this] + { + auto& modelManager = OVSERVICE(OvCore::ResourceManagement::ModelManager); + std::string resourcePath = EDITOR_EXEC(GetResourcePath(filePath, m_protected)); + if (modelManager.IsResourceRegistered(resourcePath)) + { + modelManager.AResourceManager::ReloadResource(resourcePath); + } + }; + + auto& editMetadata = CreateWidget("Edit metadata"); + + editMetadata.ClickedEvent += [this] + { + auto& panel = EDITOR_PANEL(OvEditor::Panels::AssetMetadataEditor, "Asset Metadata Editor"); + panel.SetTarget(filePath); + panel.Open(); + panel.Focus(); + }; + if (!m_protected) { auto& generateMaterialsMenu = CreateWidget("Generate materials..."); @@ -790,11 +813,21 @@ class TextureContextualMenu : public PreviewableContextualMenu("Edit metadata"); + + editMetadata.ClickedEvent += [this] + { + auto& panel = EDITOR_PANEL(OvEditor::Panels::AssetMetadataEditor, "Asset Metadata Editor"); + panel.SetTarget(filePath); + panel.Open(); + panel.Focus(); + }; + PreviewableContextualMenu::CreateList(); } }; @@ -847,10 +880,12 @@ class MaterialContextualMenu : public PreviewableContextualMenu("Reload"); reload.ClickedEvent += [this] { - OvCore::Resources::Material* material = OVSERVICE(OvCore::ResourceManagement::MaterialManager)[EDITOR_EXEC(GetResourcePath(filePath, m_protected))]; + auto materialManager = OVSERVICE(OvCore::ResourceManagement::MaterialManager); + auto resourcePath = EDITOR_EXEC(GetResourcePath(filePath, m_protected)); + OvCore::Resources::Material* material = materialManager[resourcePath]; if (material) { - OvCore::Resources::Loaders::MaterialLoader::Reload(*material, filePath); + materialManager.AResourceManager::ReloadResource(resourcePath); EDITOR_PANEL(OvEditor::Panels::MaterialEditor, "Material Editor").Refresh(); } }; @@ -957,6 +992,14 @@ void OvEditor::Panels::AssetBrowser::ConsiderItem(OvUI::Widgets::Layout::TreeNod std::string resourceFormatPath = EDITOR_EXEC(GetResourcePath(path, p_isEngineItem)); bool protectedItem = !p_root || p_isEngineItem; + OvTools::Utils::PathParser::EFileType fileType = OvTools::Utils::PathParser::GetFileType(itemname); + + // Unknown file, so we skip it + if (fileType == OvTools::Utils::PathParser::EFileType::UNKNOWN && !isDirectory) + { + return; + } + /* If there is a given treenode (p_root) we attach the new widget to it */ auto& itemGroup = p_root ? p_root->CreateWidget() : m_assetList->CreateWidget(); @@ -1140,8 +1183,6 @@ void OvEditor::Panels::AssetBrowser::ConsiderItem(OvUI::Widgets::Layout::TreeNod } else { - OvTools::Utils::PathParser::EFileType fileType = OvTools::Utils::PathParser::GetFileType(itemname); - auto& clickableText = itemGroup.CreateWidget(itemname); FileContextualMenu* contextMenu = nullptr; diff --git a/Sources/Overload/OvEditor/src/OvEditor/Panels/AssetMetadataEditor.cpp b/Sources/Overload/OvEditor/src/OvEditor/Panels/AssetMetadataEditor.cpp new file mode 100644 index 00000000..743603ca --- /dev/null +++ b/Sources/Overload/OvEditor/src/OvEditor/Panels/AssetMetadataEditor.cpp @@ -0,0 +1,233 @@ +/** +* @project: Overload +* @author: Overload Tech. +* @licence: MIT +*/ + +#include + +#include +#include +#include +#include + +#include +#include +#include +#include + +#include "OvEditor/Panels/AssetMetadataEditor.h" +#include "OvEditor/Panels/AssetView.h" +#include "OvEditor/Core/EditorActions.h" + +OvEditor::Panels::AssetMetadataEditor::AssetMetadataEditor +( + const std::string& p_title, + bool p_opened, + const OvUI::Settings::PanelWindowSettings& p_windowSettings +) : + PanelWindow(p_title, p_opened, p_windowSettings) +{ + CreateHeaderButtons(); + CreateWidget(); + m_settings = &CreateWidget>(); + m_settings->widths[0] = 150; +} + +void OvEditor::Panels::AssetMetadataEditor::SetTarget(const std::string& p_path) +{ + m_resource = p_path; + m_metadata.reset(new OvTools::Filesystem::IniFile(m_resource + ".meta")); + CreateSettings(); +} + +void OvEditor::Panels::AssetMetadataEditor::Preview() +{ + auto& assetView = EDITOR_PANEL(OvEditor::Panels::AssetView, "Asset View"); + + auto resourcePath = EDITOR_EXEC(GetResourcePath(m_resource)); + auto fileType = OvTools::Utils::PathParser::GetFileType(m_resource); + + if (fileType == OvTools::Utils::PathParser::EFileType::MODEL) + { + if (auto resource = OVSERVICE(OvCore::ResourceManagement::ModelManager).GetResource(resourcePath)) + { + assetView.SetResource(resource); + } + } + else if (fileType == OvTools::Utils::PathParser::EFileType::TEXTURE) + { + if (auto resource = OVSERVICE(OvCore::ResourceManagement::TextureManager).GetResource(resourcePath)) + { + assetView.SetResource(resource); + } + } + + assetView.Open(); +} + +void OvEditor::Panels::AssetMetadataEditor::CreateHeaderButtons() +{ + auto& applyButton = CreateWidget("Apply"); + applyButton.idleBackgroundColor = { 0.0f, 0.5f, 0.0f }; + applyButton.ClickedEvent += [this] + { + Apply(); + }; + + applyButton.lineBreak = false; + + auto& reloadButton = CreateWidget("Revert"); + reloadButton.idleBackgroundColor = { 0.7f, 0.5f, 0.0f }; + reloadButton.ClickedEvent += [this] + { + SetTarget(m_resource); + }; + + reloadButton.lineBreak = false; + + auto& previewButton = CreateWidget("Preview"); + previewButton.idleBackgroundColor = { 0.7f, 0.5f, 0.0f }; + previewButton.ClickedEvent += std::bind(&AssetMetadataEditor::Preview, this); + previewButton.lineBreak = false; + + auto& defaultButton = CreateWidget("Reset to default"); + defaultButton.idleBackgroundColor = { 0.5f, 0.0f, 0.0f }; + defaultButton.ClickedEvent += [this] + { + m_metadata->RemoveAll(); + CreateSettings(); + }; +} + +void OvEditor::Panels::AssetMetadataEditor::CreateSettings() +{ + m_settings->RemoveAllWidgets(); + + auto fileType = OvTools::Utils::PathParser::GetFileType(m_resource); + if (fileType == OvTools::Utils::PathParser::EFileType::MODEL) + { + CreateModelSettings(); + } + else if (fileType == OvTools::Utils::PathParser::EFileType::TEXTURE) + { + CreateTextureSettings(); + } +} + +#define MODEL_FLAG_ENTRY(setting) OvCore::Helpers::GUIDrawer::DrawBoolean(*m_settings, setting, [&]() { return m_metadata->Get(setting); }, [&](bool value) { m_metadata->Set(setting, value); }) + +void OvEditor::Panels::AssetMetadataEditor::CreateModelSettings() +{ + m_metadata->Add("CALC_TANGENT_SPACE", true); + m_metadata->Add("JOIN_IDENTICAL_VERTICES", true); + m_metadata->Add("MAKE_LEFT_HANDED", false); + m_metadata->Add("TRIANGULATE", true); + m_metadata->Add("REMOVE_COMPONENT", false); + m_metadata->Add("GEN_NORMALS", false); + m_metadata->Add("GEN_SMOOTH_NORMALS", true); + m_metadata->Add("SPLIT_LARGE_MESHES", false); + m_metadata->Add("PRE_TRANSFORM_VERTICES", true); + m_metadata->Add("LIMIT_BONE_WEIGHTS", false); + m_metadata->Add("VALIDATE_DATA_STRUCTURE", false); + m_metadata->Add("IMPROVE_CACHE_LOCALITY", true); + m_metadata->Add("REMOVE_REDUNDANT_MATERIALS", false); + m_metadata->Add("FIX_INFACING_NORMALS", false); + m_metadata->Add("SORT_BY_PTYPE", false); + m_metadata->Add("FIND_DEGENERATES", false); + m_metadata->Add("FIND_INVALID_DATA", true); + m_metadata->Add("GEN_UV_COORDS", true); + m_metadata->Add("TRANSFORM_UV_COORDS", false); + m_metadata->Add("FIND_INSTANCES", true); + m_metadata->Add("OPTIMIZE_MESHES", true); + m_metadata->Add("OPTIMIZE_GRAPH", true); + m_metadata->Add("FLIP_UVS", false); + m_metadata->Add("FLIP_WINDING_ORDER", false); + m_metadata->Add("SPLIT_BY_BONE_COUNT", false); + m_metadata->Add("DEBONE", true); + + MODEL_FLAG_ENTRY("CALC_TANGENT_SPACE"); + MODEL_FLAG_ENTRY("JOIN_IDENTICAL_VERTICES"); + MODEL_FLAG_ENTRY("MAKE_LEFT_HANDED"); + MODEL_FLAG_ENTRY("TRIANGULATE"); + MODEL_FLAG_ENTRY("REMOVE_COMPONENT"); + MODEL_FLAG_ENTRY("GEN_NORMALS"); + MODEL_FLAG_ENTRY("GEN_SMOOTH_NORMALS"); + MODEL_FLAG_ENTRY("SPLIT_LARGE_MESHES"); + MODEL_FLAG_ENTRY("PRE_TRANSFORM_VERTICES"); + MODEL_FLAG_ENTRY("LIMIT_BONE_WEIGHTS"); + MODEL_FLAG_ENTRY("VALIDATE_DATA_STRUCTURE"); + MODEL_FLAG_ENTRY("IMPROVE_CACHE_LOCALITY"); + MODEL_FLAG_ENTRY("REMOVE_REDUNDANT_MATERIALS"); + MODEL_FLAG_ENTRY("FIX_INFACING_NORMALS"); + MODEL_FLAG_ENTRY("SORT_BY_PTYPE"); + MODEL_FLAG_ENTRY("FIND_DEGENERATES"); + MODEL_FLAG_ENTRY("FIND_INVALID_DATA"); + MODEL_FLAG_ENTRY("GEN_UV_COORDS"); + MODEL_FLAG_ENTRY("TRANSFORM_UV_COORDS"); + MODEL_FLAG_ENTRY("FIND_INSTANCES"); + MODEL_FLAG_ENTRY("OPTIMIZE_MESHES"); + MODEL_FLAG_ENTRY("OPTIMIZE_GRAPH"); + MODEL_FLAG_ENTRY("FLIP_UVS"); + MODEL_FLAG_ENTRY("FLIP_WINDING_ORDER"); + MODEL_FLAG_ENTRY("SPLIT_BY_BONE_COUNT"); + MODEL_FLAG_ENTRY("DEBONE"); +}; + +void OvEditor::Panels::AssetMetadataEditor::CreateTextureSettings() +{ + m_metadata->Add("MIN_FILTER", static_cast(OvRendering::Settings::ETextureFilteringMode::LINEAR_MIPMAP_LINEAR)); + m_metadata->Add("MAG_FILTER", static_cast(OvRendering::Settings::ETextureFilteringMode::LINEAR)); + m_metadata->Add("ENABLE_MIPMAPPING", true); + + std::map filteringModes; + filteringModes.emplace(0x2600, "NEAREST"); + filteringModes.emplace(0x2601, "LINEAR"); + filteringModes.emplace(0x2700, "NEAREST_MIPMAP_NEAREST"); + filteringModes.emplace(0x2703, "LINEAR_MIPMAP_LINEAR"); + filteringModes.emplace(0x2701, "LINEAR_MIPMAP_NEAREST"); + filteringModes.emplace(0x2702, "NEAREST_MIPMAP_LINEAR"); + + OvCore::Helpers::GUIDrawer::CreateTitle(*m_settings, "MIN_FILTER"); + auto& minFilter = m_settings->CreateWidget(m_metadata->Get("MIN_FILTER")); + minFilter.choices = filteringModes; + minFilter.ValueChangedEvent += [this](int p_choice) + { + m_metadata->Set("MIN_FILTER", p_choice); + }; + + OvCore::Helpers::GUIDrawer::CreateTitle(*m_settings, "MAG_FILTER"); + auto& magFilter = m_settings->CreateWidget(m_metadata->Get("MAG_FILTER")); + magFilter.choices = filteringModes; + magFilter.ValueChangedEvent += [this](int p_choice) + { + m_metadata->Set("MAG_FILTER", p_choice); + }; + + OvCore::Helpers::GUIDrawer::DrawBoolean(*m_settings, "ENABLE_MIPMAPPING", [&]() { return m_metadata->Get("ENABLE_MIPMAPPING"); }, [&](bool value) { m_metadata->Set("ENABLE_MIPMAPPING", value); }); +} + +void OvEditor::Panels::AssetMetadataEditor::Apply() +{ + m_metadata->Rewrite(); + + auto resourcePath = EDITOR_EXEC(GetResourcePath(m_resource)); + auto fileType = OvTools::Utils::PathParser::GetFileType(m_resource); + + if (fileType == OvTools::Utils::PathParser::EFileType::MODEL) + { + auto& modelManager = OVSERVICE(OvCore::ResourceManagement::ModelManager); + if (modelManager.IsResourceRegistered(resourcePath)) + { + modelManager.AResourceManager::ReloadResource(resourcePath); + } + } + else if (fileType == OvTools::Utils::PathParser::EFileType::TEXTURE) + { + auto& textureManager = OVSERVICE(OvCore::ResourceManagement::TextureManager); + if (textureManager.IsResourceRegistered(resourcePath)) + { + textureManager.AResourceManager::ReloadResource(resourcePath); + } + } +} diff --git a/Sources/Overload/OvRendering/include/OvRendering/Resources/Loaders/ModelLoader.h b/Sources/Overload/OvRendering/include/OvRendering/Resources/Loaders/ModelLoader.h index 743eb7fb..71064bcc 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/Resources/Loaders/ModelLoader.h +++ b/Sources/Overload/OvRendering/include/OvRendering/Resources/Loaders/ModelLoader.h @@ -31,6 +31,14 @@ namespace OvRendering::Resources::Loaders */ static Model* Create(const std::string& p_filepath, Parsers::EModelParserFlags p_parserFlags = Parsers::EModelParserFlags::NONE); + /** + * Reload a model from file + * @param p_model + * @param p_filePath + * @param p_parserFlags + */ + static void Reload(Model& p_model, const std::string& p_filePath, Parsers::EModelParserFlags p_parserFlags = Parsers::EModelParserFlags::NONE); + /** * Disabled constructor * @param p_modelInstance diff --git a/Sources/Overload/OvRendering/include/OvRendering/Resources/Loaders/TextureLoader.h b/Sources/Overload/OvRendering/include/OvRendering/Resources/Loaders/TextureLoader.h index 45028252..794b28a1 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/Resources/Loaders/TextureLoader.h +++ b/Sources/Overload/OvRendering/include/OvRendering/Resources/Loaders/TextureLoader.h @@ -58,8 +58,11 @@ namespace OvRendering::Resources::Loaders * Reload a texture from file * @param p_texture * @param p_filePath + * @param p_firstFilter + * @param p_secondFilter + * @param p_generateMipmap */ - static void Reload(Texture& p_texture, const std::string& p_filePath); + static void Reload(Texture& p_texture, const std::string& p_filePath, OvRendering::Settings::ETextureFilteringMode p_firstFilter, OvRendering::Settings::ETextureFilteringMode p_secondFilter, bool p_generateMipmap); /** * Destroy a texture diff --git a/Sources/Overload/OvRendering/src/OvRendering/Resources/Loaders/ModelLoader.cpp b/Sources/Overload/OvRendering/src/OvRendering/Resources/Loaders/ModelLoader.cpp index caec5684..db561678 100644 --- a/Sources/Overload/OvRendering/src/OvRendering/Resources/Loaders/ModelLoader.cpp +++ b/Sources/Overload/OvRendering/src/OvRendering/Resources/Loaders/ModelLoader.cpp @@ -23,6 +23,19 @@ OvRendering::Resources::Model* OvRendering::Resources::Loaders::ModelLoader::Cre return nullptr; } +void OvRendering::Resources::Loaders::ModelLoader::Reload(Model& p_model, const std::string& p_filePath, Parsers::EModelParserFlags p_parserFlags) +{ + Model* newModel = Create(p_filePath, p_parserFlags); + + if (newModel) + { + p_model.m_meshes = newModel->m_meshes; + p_model.m_materialNames = newModel->m_materialNames; + newModel->m_meshes.clear(); + delete newModel; + } +} + bool OvRendering::Resources::Loaders::ModelLoader::Destroy(Model*& p_modelInstance) { if (p_modelInstance) diff --git a/Sources/Overload/OvRendering/src/OvRendering/Resources/Loaders/TextureLoader.cpp b/Sources/Overload/OvRendering/src/OvRendering/Resources/Loaders/TextureLoader.cpp index b9eb7b57..ccb6735b 100644 --- a/Sources/Overload/OvRendering/src/OvRendering/Resources/Loaders/TextureLoader.cpp +++ b/Sources/Overload/OvRendering/src/OvRendering/Resources/Loaders/TextureLoader.cpp @@ -97,9 +97,9 @@ OvRendering::Resources::Texture* OvRendering::Resources::Loaders::TextureLoader: return new Texture("", textureID, 1, 1, 32, p_firstFilter, p_secondFilter, p_generateMipmap); } -void OvRendering::Resources::Loaders::TextureLoader::Reload(Texture & p_texture, const std::string & p_filePath) +void OvRendering::Resources::Loaders::TextureLoader::Reload(Texture& p_texture, const std::string& p_filePath, OvRendering::Settings::ETextureFilteringMode p_firstFilter, OvRendering::Settings::ETextureFilteringMode p_secondFilter, bool p_generateMipmap) { - Texture* newTexture = Create(p_filePath, p_texture.firstFilter, p_texture.secondFilter, p_texture.isMimapped); + Texture* newTexture = Create(p_filePath, p_firstFilter, p_secondFilter, p_generateMipmap); if (newTexture) { diff --git a/Sources/Overload/OvTools/include/OvTools/Filesystem/IniFile.h b/Sources/Overload/OvTools/include/OvTools/Filesystem/IniFile.h index 52691f88..0e12862e 100644 --- a/Sources/Overload/OvTools/include/OvTools/Filesystem/IniFile.h +++ b/Sources/Overload/OvTools/include/OvTools/Filesystem/IniFile.h @@ -47,6 +47,15 @@ namespace OvTools::Filesystem template T Get(const std::string& p_key); + /** + * Return the value attached to the given key + * If the key doesn't exist, the specified value is returned + * @param p_key + * @param p_default + */ + template + T GetOrDefault(const std::string& p_key, T p_default); + /** * Set a new value to the given key (Not applied to the real file untill Rewrite() or Save() is called) * @param p_key diff --git a/Sources/Overload/OvTools/include/OvTools/Filesystem/IniFile.inl b/Sources/Overload/OvTools/include/OvTools/Filesystem/IniFile.inl index 1fc0f5fd..a54b381f 100644 --- a/Sources/Overload/OvTools/include/OvTools/Filesystem/IniFile.inl +++ b/Sources/Overload/OvTools/include/OvTools/Filesystem/IniFile.inl @@ -50,6 +50,12 @@ namespace OvTools::Filesystem } } + template + inline T IniFile::GetOrDefault(const std::string& p_key, T p_default) + { + return IsKeyExisting(p_key) ? Get(p_key) : p_default; + } + template inline bool IniFile::Set(const std::string& p_key, const T& p_value) { From 080bce965731e4cfaf3b1af6609b4c2efcb7bc5a Mon Sep 17 00:00:00 2001 From: Adrien GIVRY Date: Sat, 29 Feb 2020 11:32:52 -0500 Subject: [PATCH 06/46] Renaming/moving/deleting an asset now affects its metadata --- .../src/OvEditor/Panels/AssetBrowser.cpp | 42 ++++++++++++++++--- 1 file changed, 37 insertions(+), 5 deletions(-) diff --git a/Sources/Overload/OvEditor/src/OvEditor/Panels/AssetBrowser.cpp b/Sources/Overload/OvEditor/src/OvEditor/Panels/AssetBrowser.cpp index c8bf5fac..1552eab5 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Panels/AssetBrowser.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Panels/AssetBrowser.cpp @@ -43,6 +43,38 @@ using namespace OvUI::Widgets; const std::string FILENAMES_CHARS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ.-_=+ 0123456789()[]"; +std::string GetAssociatedMetaFile(const std::string& p_assetPath) +{ + return p_assetPath + ".meta"; +} + +void RenameAsset(const std::string& p_prev, const std::string& p_new) +{ + std::filesystem::rename(p_prev, p_new); + + if (const std::string previousMetaPath = GetAssociatedMetaFile(p_prev); std::filesystem::exists(previousMetaPath)) + { + if (const std::string newMetaPath = GetAssociatedMetaFile(p_new); !std::filesystem::exists(newMetaPath)) + { + std::filesystem::rename(previousMetaPath, newMetaPath); + } + else + { + OVLOG_ERROR(newMetaPath + " is already existing, .meta creation failed"); + } + } +} + +void RemoveAsset(const std::string& p_toDelete) +{ + std::filesystem::remove(p_toDelete); + + if (const std::string metaPath = GetAssociatedMetaFile(p_toDelete); std::filesystem::exists(metaPath)) + { + std::filesystem::remove(metaPath); + } +} + class TexturePreview : public OvUI::Plugins::IPlugin { public: @@ -582,7 +614,7 @@ class FileContextualMenu : public BrowserItemContextualMenu if (message.GetUserAction() == MessageBox::EUserAction::YES) { - std::filesystem::remove(filePath); + RemoveAsset(filePath); DestroyedEvent.Invoke(filePath); EDITOR_EXEC(PropagateFileRename(filePath, "?")); } @@ -1056,7 +1088,7 @@ void OvEditor::Panels::AssetBrowser::ConsiderItem(OvUI::Widgets::Layout::TreeNod std::filesystem::copy(prevPath, newPath, std::filesystem::copy_options::recursive); else { - std::filesystem::rename(prevPath, newPath); + RenameAsset(prevPath, newPath); EDITOR_EXEC(PropagateFolderRename(prevPath, newPath)); } @@ -1106,7 +1138,7 @@ void OvEditor::Panels::AssetBrowser::ConsiderItem(OvUI::Widgets::Layout::TreeNod std::filesystem::copy_file(prevPath, newPath); else { - std::filesystem::rename(prevPath, newPath); + RenameAsset(prevPath, newPath); EDITOR_EXEC(PropagateFileRename(prevPath, newPath)); } @@ -1139,7 +1171,7 @@ void OvEditor::Panels::AssetBrowser::ConsiderItem(OvUI::Widgets::Layout::TreeNod if (!std::filesystem::exists(p_newPath)) // Do not rename a folder if it already exists { - std::filesystem::rename(p_prev, p_newPath); + RenameAsset(p_prev, p_newPath); EDITOR_EXEC(PropagateFolderRename(p_prev, p_newPath)); std::string elementName = OvTools::Utils::PathParser::GetElementName(p_newPath); std::string data = OvTools::Utils::PathParser::GetContainingFolder(ddSource.data.first) + elementName + "\\"; @@ -1220,7 +1252,7 @@ void OvEditor::Panels::AssetBrowser::ConsiderItem(OvUI::Widgets::Layout::TreeNod { if (!std::filesystem::exists(p_newPath)) { - std::filesystem::rename(p_prev, p_newPath); + RenameAsset(p_prev, p_newPath); std::string elementName = OvTools::Utils::PathParser::GetElementName(p_newPath); ddSource.data.first = OvTools::Utils::PathParser::GetContainingFolder(ddSource.data.first) + elementName; From 0c14fce16d4936140c651e871684a59837019121 Mon Sep 17 00:00:00 2001 From: Adrien GIVRY Date: Sat, 29 Feb 2020 11:49:12 -0500 Subject: [PATCH 07/46] Fixing crash when not using CALC_TANGENT_SPACE flag CALC_TANGENT_SPACE is a flag used to generate tangents and bitangents for a given model. Our ASSIMP model parser was assuming binormals and tangents were set, thus, if the flag wasn't set a crash occured. An additional check has been added, and tangents and bitangents are set to Vector3.Zero if no info has been found. --- .../src/OvRendering/Resources/Parsers/AssimpParser.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/Overload/OvRendering/src/OvRendering/Resources/Parsers/AssimpParser.cpp b/Sources/Overload/OvRendering/src/OvRendering/Resources/Parsers/AssimpParser.cpp index a2b01866..6822293a 100644 --- a/Sources/Overload/OvRendering/src/OvRendering/Resources/Parsers/AssimpParser.cpp +++ b/Sources/Overload/OvRendering/src/OvRendering/Resources/Parsers/AssimpParser.cpp @@ -72,8 +72,8 @@ void OvRendering::Resources::Parsers::AssimpParser::ProcessMesh(void* p_transfor aiVector3D position = meshTransformation * p_mesh->mVertices[i]; aiVector3D normal = meshTransformation * (p_mesh->mNormals ? p_mesh->mNormals[i] : aiVector3D(0.0f, 0.0f, 0.0f)); aiVector3D texCoords = p_mesh->mTextureCoords[0] ? p_mesh->mTextureCoords[0][i] : aiVector3D(0.0f, 0.0f, 0.0f); - aiVector3D tangent = p_mesh->mTextureCoords[0] ? meshTransformation * p_mesh->mTangents[i] : aiVector3D(0.0f, 0.0f, 0.0f); - aiVector3D bitangent = p_mesh->mTextureCoords[0] ? meshTransformation * p_mesh->mBitangents[i] : aiVector3D(0.0f, 0.0f, 0.0f); + aiVector3D tangent = p_mesh->mTangents ? meshTransformation * p_mesh->mTangents[i] : aiVector3D(0.0f, 0.0f, 0.0f); + aiVector3D bitangent = p_mesh->mBitangents ? meshTransformation * p_mesh->mBitangents[i] : aiVector3D(0.0f, 0.0f, 0.0f); p_outVertices.push_back ( From 7c6a88c1d1beb34a2e643376417fc3497cd9d4e6 Mon Sep 17 00:00:00 2001 From: Adrien GIVRY Date: Sat, 29 Feb 2020 17:08:10 -0500 Subject: [PATCH 08/46] Delete actor shortcut key added It is now possible to delete an actor using [Del] key while focusing the SceneView or Hierarchy. --- .../Overload/OvEditor/include/OvEditor/Core/Editor.h | 5 +++++ Sources/Overload/OvEditor/src/OvEditor/Core/Editor.cpp | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/Sources/Overload/OvEditor/include/OvEditor/Core/Editor.h b/Sources/Overload/OvEditor/include/OvEditor/Core/Editor.h index 860ee097..bdf63808 100644 --- a/Sources/Overload/OvEditor/include/OvEditor/Core/Editor.h +++ b/Sources/Overload/OvEditor/include/OvEditor/Core/Editor.h @@ -54,6 +54,11 @@ namespace OvEditor::Core */ void Update(float p_deltaTime); + /** + * Handle editor global shortcuts + */ + void HandleGlobalShortcuts(); + /** * Update the current editor mode * @param p_deltaTime diff --git a/Sources/Overload/OvEditor/src/OvEditor/Core/Editor.cpp b/Sources/Overload/OvEditor/src/OvEditor/Core/Editor.cpp index 28a8ccc7..e1e922b4 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Core/Editor.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Core/Editor.cpp @@ -83,6 +83,7 @@ void OvEditor::Core::Editor::PreUpdate() void OvEditor::Core::Editor::Update(float p_deltaTime) { + HandleGlobalShortcuts(); UpdateCurrentEditorMode(p_deltaTime); PrepareRendering(p_deltaTime); UpdateEditorPanels(p_deltaTime); @@ -91,6 +92,15 @@ void OvEditor::Core::Editor::Update(float p_deltaTime) m_editorActions.ExecuteDelayedActions(); } +void OvEditor::Core::Editor::HandleGlobalShortcuts() +{ + // If the [Del] key is pressed while an actor is selected and the Scene View or Hierarchy is focused + if (m_context.inputManager->IsKeyPressed(OvWindowing::Inputs::EKey::KEY_DELETE) && EDITOR_EXEC(IsAnyActorSelected()) && (EDITOR_PANEL(SceneView, "Scene View").IsFocused() || EDITOR_PANEL(Hierarchy, "Hierarchy").IsFocused())) + { + EDITOR_EXEC(DestroyActor(EDITOR_EXEC(GetSelectedActor()))); + } +} + void OvEditor::Core::Editor::UpdateCurrentEditorMode(float p_deltaTime) { if (auto editorMode = m_editorActions.GetCurrentEditorMode(); editorMode == EditorActions::EEditorMode::PLAY || editorMode == EditorActions::EEditorMode::FRAME_BY_FRAME) From f797f98313615e0fcb9a72b1e92711d60d5d4c75 Mon Sep 17 00:00:00 2001 From: Adrien GIVRY Date: Sat, 29 Feb 2020 16:36:51 -0500 Subject: [PATCH 09/46] Orbital camera added It is now possible to use the orbit camera in the editor by pressing [Alt] and the middle mouse button at the same time. The camera (OvRendering) is now Quaternion-based. However, the CameraController is still converting the rotation (Quaternion) to a yaw-pitch-roll model (Easier for FPS and orbit rotations). --- .../include/OvCore/ECS/Components/CCamera.h | 3 +- .../src/OvCore/ECS/Components/CCamera.cpp | 14 -- .../include/OvEditor/Core/CameraController.h | 28 ++- .../OvEditor/include/OvEditor/Panels/AView.h | 12 + .../src/OvEditor/Core/CameraController.cpp | 233 +++++++++++------- .../src/OvEditor/Core/EditorActions.cpp | 16 +- .../src/OvEditor/Core/EditorRenderer.cpp | 4 +- .../OvEditor/src/OvEditor/Panels/AView.cpp | 17 +- .../src/OvEditor/Panels/AViewControllable.cpp | 2 +- .../OvEditor/src/OvEditor/Panels/GameView.cpp | 1 + .../OvGame/src/OvGame/Core/GameRenderer.cpp | 3 +- .../OvMaths/include/OvMaths/FQuaternion.h | 7 + .../OvMaths/src/OvMaths/FQuaternion.cpp | 62 +++++ .../include/OvRendering/LowRenderer/Camera.h | 76 +----- .../src/OvRendering/LowRenderer/Camera.cpp | 96 +------- .../include/OvTools/Utils/ReferenceOrValue.h | 4 +- 16 files changed, 301 insertions(+), 277 deletions(-) diff --git a/Sources/Overload/OvCore/include/OvCore/ECS/Components/CCamera.h b/Sources/Overload/OvCore/include/OvCore/ECS/Components/CCamera.h index 507c1197..cfc54b2a 100644 --- a/Sources/Overload/OvCore/include/OvCore/ECS/Components/CCamera.h +++ b/Sources/Overload/OvCore/include/OvCore/ECS/Components/CCamera.h @@ -28,7 +28,7 @@ namespace OvCore::ECS::Components /** * Destructor */ - ~CCamera(); + ~CCamera() = default; /** * Returns the name of the component @@ -128,6 +128,5 @@ namespace OvCore::ECS::Components private: OvRendering::LowRenderer::Camera m_camera; - OvTools::Eventing::ListenerID m_transformNotificationHandlerID; }; } \ No newline at end of file diff --git a/Sources/Overload/OvCore/src/OvCore/ECS/Components/CCamera.cpp b/Sources/Overload/OvCore/src/OvCore/ECS/Components/CCamera.cpp index 2f358af3..7acf7cfa 100644 --- a/Sources/Overload/OvCore/src/OvCore/ECS/Components/CCamera.cpp +++ b/Sources/Overload/OvCore/src/OvCore/ECS/Components/CCamera.cpp @@ -14,20 +14,6 @@ OvCore::ECS::Components::CCamera::CCamera(ECS::Actor& p_owner) : AComponent(p_ow { /* Default clear color for the CCamera (Different from Camera default clear color) */ SetClearColor({ 0.1921569f, 0.3019608f, 0.4745098f }); - - /* Handle the collider scaling when the actor transform changes */ - m_transformNotificationHandlerID = owner.transform.GetFTransform().Notifier.AddNotificationHandler([this](auto p_notification) - { - if (p_notification == OvMaths::Internal::TransformNotifier::ENotification::TRANSFORM_CHANGED) - { - m_camera.SetRotation(owner.transform.GetWorldRotation()); - } - }); -} - -OvCore::ECS::Components::CCamera::~CCamera() -{ - owner.transform.GetFTransform().Notifier.RemoveNotificationHandler(m_transformNotificationHandlerID); } std::string OvCore::ECS::Components::CCamera::GetName() diff --git a/Sources/Overload/OvEditor/include/OvEditor/Core/CameraController.h b/Sources/Overload/OvEditor/include/OvEditor/Core/CameraController.h index 2e86e333..188907ae 100644 --- a/Sources/Overload/OvEditor/include/OvEditor/Core/CameraController.h +++ b/Sources/Overload/OvEditor/include/OvEditor/Core/CameraController.h @@ -28,6 +28,7 @@ namespace OvEditor::Core * @param p_view * @param p_camera * @param p_position + * @param p_rotation * @param p_enableFocusInputs */ CameraController @@ -35,6 +36,7 @@ namespace OvEditor::Core OvEditor::Panels::AView& p_view, OvRendering::LowRenderer::Camera& p_camera, OvMaths::FVector3& p_position, + OvMaths::FQuaternion& p_rotation, bool p_enableFocusInputs = false ); @@ -76,7 +78,12 @@ namespace OvEditor::Core /** * Returns the position of the camera */ - OvMaths::FVector3 GetPosition() const; + const OvMaths::FVector3& GetPosition() const; + + /** + * Returns the position of the camera + */ + const OvMaths::FQuaternion& GetRotation() const; /** * Returns true if the right mouse click is being pressed @@ -84,10 +91,12 @@ namespace OvEditor::Core bool IsRightMousePressed() const; private: - void HandleCameraXYMovement(float p_deltaTime); - void HandleCameraZMovement(float p_deltaTime); - void HandleCameraRotation(float p_deltaTime); - void HandleKeyboardMovement(float p_deltaTime); + void HandleCameraPanning(const OvMaths::FVector2& p_mouseOffset, bool p_firstMouse); + void HandleCameraOrbit(const OvMaths::FVector2& p_mouseOffset, bool p_firstMouse); + void HandleCameraFPSMouse(const OvMaths::FVector2& p_mouseOffset, bool p_firstMouse); + + void HandleCameraZoom(); + void HandleCameraFPSKeyboard(float p_deltaTime); void UpdateMouseState(); private: @@ -96,8 +105,9 @@ namespace OvEditor::Core OvEditor::Panels::AView& m_view; OvRendering::LowRenderer::Camera& m_camera; OvMaths::FVector3& m_cameraPosition; + OvMaths::FQuaternion& m_cameraRotation; - std::queue> m_cameraDestinations; + std::queue> m_cameraDestinations; bool m_enableFocusInputs; @@ -108,13 +118,17 @@ namespace OvEditor::Core OvMaths::FVector3 m_targetSpeed; OvMaths::FVector3 m_currentMovementSpeed; + OvMaths::FTransform* m_orbitTarget = nullptr; + OvMaths::FVector3 m_orbitStartOffset; bool m_firstMouse = true; double m_lastMousePosX = 0.0; double m_lastMousePosY = 0.0; + OvMaths::FVector3 m_ypr; float m_mouseSensitivity = 0.05f; float m_cameraDragSpeed = 0.01f; + float m_cameraOrbitSpeed = 0.5f; float m_cameraMoveSpeed = 5.0f; float m_focusDistance = 15.0f; - float m_focusLerpCoefficient = 6.0f; + float m_focusLerpCoefficient = 8.0f; }; } \ No newline at end of file diff --git a/Sources/Overload/OvEditor/include/OvEditor/Panels/AView.h b/Sources/Overload/OvEditor/include/OvEditor/Panels/AView.h index 30b6ed1a..ced143b4 100644 --- a/Sources/Overload/OvEditor/include/OvEditor/Panels/AView.h +++ b/Sources/Overload/OvEditor/include/OvEditor/Panels/AView.h @@ -63,11 +63,22 @@ namespace OvEditor::Panels */ void SetCameraPosition(const OvMaths::FVector3& p_position); + /** + * Defines the camera rotation + * @param p_rotation + */ + void SetCameraRotation(const OvMaths::FQuaternion& p_rotation); + /** * Returns the camera position */ const OvMaths::FVector3& GetCameraPosition() const; + /** + * Returns the camera rotation + */ + const OvMaths::FQuaternion& GetCameraRotation() const; + /** * Returns the camera used by this view */ @@ -104,6 +115,7 @@ namespace OvEditor::Panels OvEditor::Core::EditorRenderer& m_editorRenderer; OvRendering::LowRenderer::Camera m_camera; OvMaths::FVector3 m_cameraPosition; + OvMaths::FQuaternion m_cameraRotation; OvUI::Widgets::Visual::Image* m_image; OvMaths::FVector3 m_gridColor = OvMaths::FVector3::One; diff --git a/Sources/Overload/OvEditor/src/OvEditor/Core/CameraController.cpp b/Sources/Overload/OvEditor/src/OvEditor/Core/CameraController.cpp index 78a37444..82c1cf19 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Core/CameraController.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Core/CameraController.cpp @@ -21,6 +21,7 @@ OvEditor::Core::CameraController::CameraController OvEditor::Panels::AView& p_view, OvRendering::LowRenderer::Camera& p_camera, OvMaths::FVector3& p_position, + OvMaths::FQuaternion& p_rotation, bool p_enableFocusInputs ) : m_inputManager(*EDITOR_CONTEXT(inputManager)), @@ -28,6 +29,7 @@ OvEditor::Core::CameraController::CameraController m_view(p_view), m_camera(p_camera), m_cameraPosition(p_position), + m_cameraRotation(p_rotation), m_enableFocusInputs(p_enableFocusInputs) { m_camera.SetFov(60.0f); @@ -110,28 +112,28 @@ void OvEditor::Core::CameraController::HandleInputs(float p_deltaTime) if (EDITOR_EXEC(IsAnyActorSelected())) { auto targetPos = EDITOR_EXEC(GetSelectedActor()).transform.GetWorldPosition(); + float dist = GetActorFocusDist(EDITOR_EXEC(GetSelectedActor())); if (m_inputManager.IsKeyPressed(OvWindowing::Inputs::EKey::KEY_F)) + { MoveToTarget(EDITOR_EXEC(GetSelectedActor())); - - if (m_inputManager.IsKeyPressed(OvWindowing::Inputs::EKey::KEY_UP)) - m_cameraDestinations.push({ targetPos + OvMaths::FVector3{ 0.f, 1.f, 0.f } * dist, -90.f, -90.f }); - - if (m_inputManager.IsKeyPressed(OvWindowing::Inputs::EKey::KEY_DOWN)) - m_cameraDestinations.push({ targetPos + OvMaths::FVector3{ 0.f, -1.f, 0.f } * dist, 90.f, -90.f }); - - if (m_inputManager.IsKeyPressed(OvWindowing::Inputs::EKey::KEY_LEFT)) - m_cameraDestinations.push({ targetPos + OvMaths::FVector3{ -1.f, 0.f, 0.f } * dist , 0.f, 0.f }); - - if (m_inputManager.IsKeyPressed(OvWindowing::Inputs::EKey::KEY_RIGHT)) - m_cameraDestinations.push({ targetPos + OvMaths::FVector3{ 1.f, 0.f, 0.f } * dist, 0.f, 180.f }); - - if (m_inputManager.IsKeyPressed(OvWindowing::Inputs::EKey::KEY_PAGE_DOWN)) - m_cameraDestinations.push({ targetPos + OvMaths::FVector3{ 0.f, 0.f, -1.f } * dist, 0.f, 90.f }); - - if (m_inputManager.IsKeyPressed(OvWindowing::Inputs::EKey::KEY_PAGE_UP)) - m_cameraDestinations.push({ targetPos + OvMaths::FVector3{ 0.f, 0.f, 1.f } * dist, 0.f, -90.f }); + } + + auto focusObjectFromAngle = [this, &targetPos, &dist]( const OvMaths::FVector3& offset) + { + auto camPos = targetPos + offset * dist; + auto direction = OvMaths::FVector3::Normalize(targetPos - camPos); + m_cameraRotation = OvMaths::FQuaternion::LookAt(direction, abs(direction.y) == 1.0f ? OvMaths::FVector3::Right : OvMaths::FVector3::Up); + m_cameraDestinations.push({ camPos, m_cameraRotation }); + }; + + if (m_inputManager.IsKeyPressed(OvWindowing::Inputs::EKey::KEY_UP)) focusObjectFromAngle(OvMaths::FVector3::Up); + if (m_inputManager.IsKeyPressed(OvWindowing::Inputs::EKey::KEY_DOWN)) focusObjectFromAngle(-OvMaths::FVector3::Up); + if (m_inputManager.IsKeyPressed(OvWindowing::Inputs::EKey::KEY_RIGHT)) focusObjectFromAngle(OvMaths::FVector3::Right); + if (m_inputManager.IsKeyPressed(OvWindowing::Inputs::EKey::KEY_LEFT)) focusObjectFromAngle(-OvMaths::FVector3::Right); + if (m_inputManager.IsKeyPressed(OvWindowing::Inputs::EKey::KEY_PAGE_UP)) focusObjectFromAngle(OvMaths::FVector3::Forward); + if (m_inputManager.IsKeyPressed(OvWindowing::Inputs::EKey::KEY_PAGE_DOWN)) focusObjectFromAngle(-OvMaths::FVector3::Forward); } } } @@ -143,49 +145,81 @@ void OvEditor::Core::CameraController::HandleInputs(float p_deltaTime) while (m_cameraDestinations.size() != 1) m_cameraDestinations.pop(); - auto& destination = m_cameraDestinations.front(); + auto& [destPos, destRotation] = m_cameraDestinations.front(); - OvMaths::FVector3 destPos = std::get<0>(destination); - float destPitch = std::get<1>(destination); - float destYaw = std::get<2>(destination); float t = m_focusLerpCoefficient * p_deltaTime; if (OvMaths::FVector3::Distance(m_cameraPosition, destPos) <= 0.03f) + { m_cameraPosition = destPos; + m_cameraRotation = destRotation; + m_cameraDestinations.pop(); + } else + { m_cameraPosition = OvMaths::FVector3::Lerp(m_cameraPosition, destPos, t); - - if (abs(m_camera.GetPitch() - destPitch) <= 0.03f) - m_camera.SetPitch(destPitch); - else - m_camera.SetPitch(m_camera.GetPitch() + (1) * (destPitch - m_camera.GetPitch())); - - if (abs(m_camera.GetYaw() - destYaw) <= 0.03f) - m_camera.SetYaw(destYaw); - else - m_camera.SetYaw(m_camera.GetYaw() + (1) *(destYaw - m_camera.GetYaw())); - - if (m_cameraPosition == destPos && m_camera.GetYaw() == destYaw && m_camera.GetPitch() == destPitch) - m_cameraDestinations.pop(); + m_cameraRotation = OvMaths::FQuaternion::Lerp(m_cameraRotation, destRotation, t); + } } else { - if (m_middleMousePressed) - HandleCameraXYMovement(p_deltaTime); + if (m_rightMousePressed || m_middleMousePressed || m_leftMousePressed) + { + auto [xPos, yPos] = m_inputManager.GetMousePosition(); - if (m_view.IsHovered()) - HandleCameraZMovement(p_deltaTime); + bool wasFirstMouse = m_firstMouse; - if (m_rightMousePressed) - HandleCameraRotation(p_deltaTime); + if (m_firstMouse) + { + m_lastMousePosX = xPos; + m_lastMousePosY = yPos; + m_firstMouse = false; + } + + OvMaths::FVector2 mouseOffset + { + static_cast(xPos - m_lastMousePosX), + static_cast(m_lastMousePosY - yPos) + }; - HandleKeyboardMovement(p_deltaTime); + m_lastMousePosX = xPos; + m_lastMousePosY = yPos; + + if (m_rightMousePressed) + { + HandleCameraFPSMouse(mouseOffset, wasFirstMouse); + } + else + { + if (m_middleMousePressed) + { + if (m_inputManager.GetKeyState(OvWindowing::Inputs::EKey::KEY_LEFT_ALT) == OvWindowing::Inputs::EKeyState::KEY_DOWN) + { + if (EDITOR_EXEC(IsAnyActorSelected())) + { + HandleCameraOrbit(mouseOffset, wasFirstMouse); + } + } + else + { + HandleCameraPanning(mouseOffset, wasFirstMouse); + } + } + } + } + + if (m_view.IsHovered()) + { + HandleCameraZoom(); + } + + HandleCameraFPSKeyboard(p_deltaTime); } } void OvEditor::Core::CameraController::MoveToTarget(OvCore::ECS::Actor& p_target) { - m_cameraDestinations.push({ p_target.transform.GetWorldPosition() - m_camera.GetForward() * GetActorFocusDist(p_target), m_camera.GetPitch(), m_camera.GetYaw() }); + m_cameraDestinations.push({ p_target.transform.GetWorldPosition() - m_cameraRotation * OvMaths::FVector3::Forward * GetActorFocusDist(p_target), m_cameraRotation }); } void OvEditor::Core::CameraController::SetSpeed(float p_speed) @@ -205,91 +239,116 @@ void OvEditor::Core::CameraController::SetPosition(const OvMaths::FVector3 & p_p void OvEditor::Core::CameraController::SetRotation(const OvMaths::FQuaternion & p_rotation) { - m_camera.SetRotation(p_rotation); + m_cameraRotation = p_rotation; } -OvMaths::FVector3 OvEditor::Core::CameraController::GetPosition() const +const OvMaths::FVector3& OvEditor::Core::CameraController::GetPosition() const { return m_cameraPosition; } +const OvMaths::FQuaternion& OvEditor::Core::CameraController::GetRotation() const +{ + return m_cameraRotation; +} + bool OvEditor::Core::CameraController::IsRightMousePressed() const { return m_rightMousePressed; } -void OvEditor::Core::CameraController::HandleCameraXYMovement(float p_deltaTime) +void OvEditor::Core::CameraController::HandleCameraPanning(const OvMaths::FVector2& p_mouseOffset, bool p_firstMouset) { - ImGui::SetMouseCursor(ImGuiMouseCursor_Hand); + m_window.SetCursorShape(OvWindowing::Cursor::ECursorShape::HAND); + + auto mouseOffset = p_mouseOffset * m_cameraDragSpeed; + + m_cameraPosition += m_cameraRotation * OvMaths::FVector3::Right * mouseOffset.x; + m_cameraPosition -= m_cameraRotation * OvMaths::FVector3::Up * mouseOffset.y; +} - auto[xPos, yPos] = m_inputManager.GetMousePosition(); +OvMaths::FVector3 RemoveRoll(const OvMaths::FVector3& p_ypr) +{ + OvMaths::FVector3 result = p_ypr; - if (m_firstMouse) + if (result.z >= 179.0f || result.z <= -179.0f) { - m_lastMousePosX = xPos; - m_lastMousePosY = yPos; - m_firstMouse = false; + result.x += result.z; + result.y = 180.0f - result.y; + result.z = 0.0f; } - float xoffset = static_cast(xPos - m_lastMousePosX); - float yoffset = static_cast(m_lastMousePosY - yPos); + if (result.x > 180.0f) result.x -= 360.0f; + if (result.x < -180.0f) result.x += 360.0f; - m_lastMousePosX = xPos; - m_lastMousePosY = yPos; + return result; +} - m_cameraPosition -= m_camera.GetRight() * xoffset * m_cameraDragSpeed; - m_cameraPosition -= m_camera.GetUp() * yoffset * m_cameraDragSpeed; +void OvEditor::Core::CameraController::HandleCameraOrbit(const OvMaths::FVector2& p_mouseOffset, bool p_firstMouse) +{ + auto mouseOffset = p_mouseOffset * m_cameraOrbitSpeed; + + if (p_firstMouse) + { + m_ypr = OvMaths::FQuaternion::EulerAngles(m_cameraRotation); + m_ypr = RemoveRoll(m_ypr); + m_orbitTarget = &EDITOR_EXEC(GetSelectedActor()).transform.GetFTransform(); + m_orbitStartOffset = -OvMaths::FVector3::Forward * OvMaths::FVector3::Distance(m_orbitTarget->GetWorldPosition(), m_cameraPosition); + } + + m_ypr.y += -mouseOffset.x; + m_ypr.x += -mouseOffset.y; + m_ypr.x = std::max(std::min(m_ypr.x, 90.0f), -90.0f); + + auto& target = EDITOR_EXEC(GetSelectedActor()).transform.GetFTransform(); + OvMaths::FTransform pivotTransform(target.GetWorldPosition()); + OvMaths::FTransform cameraTransform(m_orbitStartOffset); + cameraTransform.SetParent(pivotTransform); + pivotTransform.RotateLocal(OvMaths::FQuaternion(m_ypr)); + m_cameraPosition = cameraTransform.GetWorldPosition(); + m_cameraRotation = cameraTransform.GetWorldRotation(); } -void OvEditor::Core::CameraController::HandleCameraZMovement(float p_deltaTime) +void OvEditor::Core::CameraController::HandleCameraZoom() { - m_cameraPosition += m_camera.GetForward() * ImGui::GetIO().MouseWheel; + m_cameraPosition += m_cameraRotation * OvMaths::FVector3::Forward * ImGui::GetIO().MouseWheel; } -void OvEditor::Core::CameraController::HandleCameraRotation(float p_deltaTime) +void OvEditor::Core::CameraController::HandleCameraFPSMouse(const OvMaths::FVector2& p_mouseOffset, bool p_firstMouse) { - auto[xPos, yPos] = m_inputManager.GetMousePosition(); + auto mouseOffset = p_mouseOffset * m_mouseSensitivity; - if (m_firstMouse) + if (p_firstMouse) { - m_lastMousePosX = xPos; - m_lastMousePosY = yPos; - m_firstMouse = false; + m_ypr = OvMaths::FQuaternion::EulerAngles(m_cameraRotation); + m_ypr = RemoveRoll(m_ypr); + OVLOG("X:" + std::to_string(m_ypr.x) + " Y:" + std::to_string(m_ypr.y) + " Z:" + std::to_string(m_ypr.z)); } - float xoffset = static_cast(xPos - m_lastMousePosX); - float yoffset = static_cast(m_lastMousePosY - yPos); - - m_lastMousePosX = xPos; - m_lastMousePosY = yPos; - - m_camera.SetYaw(m_camera.GetYaw() + xoffset * m_mouseSensitivity); - m_camera.SetPitch(m_camera.GetPitch() + yoffset * m_mouseSensitivity); + m_ypr.y -= mouseOffset.x; + m_ypr.x += -mouseOffset.y; + m_ypr.x = std::max(std::min(m_ypr.x, 90.0f), -90.0f); - if (m_camera.GetPitch() > 89.0f) - m_camera.SetPitch(89.0f); - - if (m_camera.GetPitch() < -89.0f) - m_camera.SetPitch(-89.0f); + m_cameraRotation = OvMaths::FQuaternion(m_ypr); } -void OvEditor::Core::CameraController::HandleKeyboardMovement(float p_deltaTime) +void OvEditor::Core::CameraController::HandleCameraFPSKeyboard(float p_deltaTime) { - bool run = m_inputManager.GetKeyState(OvWindowing::Inputs::EKey::KEY_LEFT_SHIFT) == OvWindowing::Inputs::EKeyState::KEY_DOWN; - float velocity = m_cameraMoveSpeed * p_deltaTime * (run ? 2.0f : 1.0f); - m_targetSpeed = OvMaths::FVector3(0.f, 0.f, 0.f); if (m_rightMousePressed) { + bool run = m_inputManager.GetKeyState(OvWindowing::Inputs::EKey::KEY_LEFT_SHIFT) == OvWindowing::Inputs::EKeyState::KEY_DOWN; + float velocity = m_cameraMoveSpeed * p_deltaTime * (run ? 2.0f : 1.0f); + if (m_inputManager.GetKeyState(OvWindowing::Inputs::EKey::KEY_W) == OvWindowing::Inputs::EKeyState::KEY_DOWN) - m_targetSpeed += m_camera.GetForward() * velocity; + m_targetSpeed += m_cameraRotation * OvMaths::FVector3::Forward * velocity; if (m_inputManager.GetKeyState(OvWindowing::Inputs::EKey::KEY_S) == OvWindowing::Inputs::EKeyState::KEY_DOWN) - m_targetSpeed += m_camera.GetForward() * -velocity; + m_targetSpeed += m_cameraRotation * OvMaths::FVector3::Forward * -velocity; if (m_inputManager.GetKeyState(OvWindowing::Inputs::EKey::KEY_A) == OvWindowing::Inputs::EKeyState::KEY_DOWN) - m_targetSpeed += m_camera.GetRight() * -velocity; + m_targetSpeed += m_cameraRotation * OvMaths::FVector3::Right * velocity; if (m_inputManager.GetKeyState(OvWindowing::Inputs::EKey::KEY_D) == OvWindowing::Inputs::EKeyState::KEY_DOWN) - m_targetSpeed += m_camera.GetRight() * velocity; + m_targetSpeed += m_cameraRotation * OvMaths::FVector3::Right * -velocity; if (m_inputManager.GetKeyState(OvWindowing::Inputs::EKey::KEY_E) == OvWindowing::Inputs::EKeyState::KEY_DOWN) m_targetSpeed += {0.0f, velocity, 0.0f}; if (m_inputManager.GetKeyState(OvWindowing::Inputs::EKey::KEY_Q) == OvWindowing::Inputs::EKeyState::KEY_DOWN) diff --git a/Sources/Overload/OvEditor/src/OvEditor/Core/EditorActions.cpp b/Sources/Overload/OvEditor/src/OvEditor/Core/EditorActions.cpp index 1afa93b1..4fffdb19 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Core/EditorActions.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Core/EditorActions.cpp @@ -389,17 +389,19 @@ int OvEditor::Core::EditorActions::GetAssetViewCameraSpeed() void OvEditor::Core::EditorActions::ResetSceneViewCameraPosition() { EDITOR_PANEL(Panels::SceneView, "Scene View").GetCameraController().SetPosition({ -10.0f, 4.0f, 10.0f }); - EDITOR_PANEL(Panels::SceneView, "Scene View").GetCamera().SetPitch(-10.0f); - EDITOR_PANEL(Panels::SceneView, "Scene View").GetCamera().SetYaw(-45.0f); - EDITOR_PANEL(Panels::SceneView, "Scene View").GetCamera().SetRoll(0.0f); + // TODO + // EDITOR_PANEL(Panels::SceneView, "Scene View").GetCamera().SetPitch(-10.0f); + // EDITOR_PANEL(Panels::SceneView, "Scene View").GetCamera().SetYaw(-45.0f); + // EDITOR_PANEL(Panels::SceneView, "Scene View").GetCamera().SetRoll(0.0f); } void OvEditor::Core::EditorActions::ResetAssetViewCameraPosition() { EDITOR_PANEL(Panels::AssetView, "Asset View").GetCameraController().SetPosition({ -10.0f, 4.0f, 10.0f }); - EDITOR_PANEL(Panels::AssetView, "Asset View").GetCamera().SetPitch(-10.0f); - EDITOR_PANEL(Panels::AssetView, "Asset View").GetCamera().SetYaw(-45.0f); - EDITOR_PANEL(Panels::AssetView, "Asset View").GetCamera().SetRoll(0.0f); + // TODO + // EDITOR_PANEL(Panels::AssetView, "Asset View").GetCamera().SetPitch(-10.0f); + // EDITOR_PANEL(Panels::AssetView, "Asset View").GetCamera().SetYaw(-45.0f); + // EDITOR_PANEL(Panels::AssetView, "Asset View").GetCamera().SetRoll(0.0f); } OvEditor::Core::EditorActions::EEditorMode OvEditor::Core::EditorActions::GetCurrentEditorMode() const @@ -479,7 +481,7 @@ void OvEditor::Core::EditorActions::NextFrame() OvMaths::FVector3 OvEditor::Core::EditorActions::CalculateActorSpawnPoint(float p_distanceToCamera) { auto& sceneView = m_panelsManager.GetPanelAs("Scene View"); - return sceneView.GetCameraPosition() + sceneView.GetCamera().GetForward() * p_distanceToCamera; + return sceneView.GetCameraPosition() + sceneView.GetCameraRotation() * OvMaths::FVector3::Forward * p_distanceToCamera; } OvCore::ECS::Actor & OvEditor::Core::EditorActions::CreateEmptyActor(bool p_focusOnCreation, OvCore::ECS::Actor* p_parent) diff --git a/Sources/Overload/OvEditor/src/OvEditor/Core/EditorRenderer.cpp b/Sources/Overload/OvEditor/src/OvEditor/Core/EditorRenderer.cpp index 64af3162..bafd0425 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Core/EditorRenderer.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Core/EditorRenderer.cpp @@ -437,8 +437,8 @@ void OvEditor::Core::EditorRenderer::RenderCameraFrustum(OvCore::ECS::Components auto& camera = p_camera.GetCamera(); const auto& cameraPos = owner.transform.GetWorldPosition(); - const auto& cameraForward = owner.transform.GetWorldForward(); const auto& cameraRotation = owner.transform.GetWorldRotation(); + const auto& cameraForward = owner.transform.GetWorldForward(); auto drawFrustumLine = [&](const FVector3& p_start, const FVector3& p_end, float planeDistance) { @@ -448,7 +448,7 @@ void OvEditor::Core::EditorRenderer::RenderCameraFrustum(OvCore::ECS::Components m_context.shapeDrawer->DrawLine(start, end, FRUSTUM_COLOR); }; - camera.CacheMatrices(gameViewSize.first, gameViewSize.second, cameraPos); + camera.CacheMatrices(gameViewSize.first, gameViewSize.second, cameraPos, cameraRotation); const auto proj = FMatrix4::Transpose(camera.GetProjectionMatrix()); const auto near = camera.GetNear(); const auto far = camera.GetFar(); diff --git a/Sources/Overload/OvEditor/src/OvEditor/Panels/AView.cpp b/Sources/Overload/OvEditor/src/OvEditor/Panels/AView.cpp index 1cda131c..04247cd9 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Panels/AView.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Panels/AView.cpp @@ -16,9 +16,8 @@ OvEditor::Panels::AView::AView const OvUI::Settings::PanelWindowSettings& p_windowSettings ) : PanelWindow(p_title, p_opened, p_windowSettings), m_editorRenderer(EDITOR_RENDERER()) { - m_cameraPosition = { -10.0f, 4.0f, 10.0f }; - m_camera.SetPitch(-10.0f); - m_camera.SetYaw(-45.f); + m_cameraPosition = { -10.0f, 3.0f, 10.0f }; + m_cameraRotation = OvMaths::FQuaternion({0.0f, 135.0f, 0.0f}); m_image = &CreateWidget(m_fbo.GetTextureID(), OvMaths::FVector2{ 0.f, 0.f }); } @@ -59,11 +58,21 @@ void OvEditor::Panels::AView::SetCameraPosition(const OvMaths::FVector3 & p_posi m_cameraPosition = p_position; } +void OvEditor::Panels::AView::SetCameraRotation(const OvMaths::FQuaternion& p_rotation) +{ + m_cameraRotation = p_rotation; +} + const OvMaths::FVector3 & OvEditor::Panels::AView::GetCameraPosition() const { return m_cameraPosition; } +const OvMaths::FQuaternion& OvEditor::Panels::AView::GetCameraRotation() const +{ + return m_cameraRotation; +} + OvRendering::LowRenderer::Camera & OvEditor::Panels::AView::GetCamera() { return m_camera; @@ -100,6 +109,6 @@ void OvEditor::Panels::AView::FillEngineUBO() void OvEditor::Panels::AView::PrepareCamera() { auto [winWidth, winHeight] = GetSafeSize(); - m_camera.CacheMatrices(winWidth, winHeight, m_cameraPosition); + m_camera.CacheMatrices(winWidth, winHeight, m_cameraPosition, m_cameraRotation); } diff --git a/Sources/Overload/OvEditor/src/OvEditor/Panels/AViewControllable.cpp b/Sources/Overload/OvEditor/src/OvEditor/Panels/AViewControllable.cpp index 61804342..c9930e68 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Panels/AViewControllable.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Panels/AViewControllable.cpp @@ -12,7 +12,7 @@ OvEditor::Panels::AViewControllable::AViewControllable bool p_opened, const OvUI::Settings::PanelWindowSettings& p_windowSettings, bool p_enableFocusInputs -) : AView(p_title, p_opened, p_windowSettings), m_cameraController(*this, m_camera, m_cameraPosition, p_enableFocusInputs) +) : AView(p_title, p_opened, p_windowSettings), m_cameraController(*this, m_camera, m_cameraPosition, m_cameraRotation, p_enableFocusInputs) { } diff --git a/Sources/Overload/OvEditor/src/OvEditor/Panels/GameView.cpp b/Sources/Overload/OvEditor/src/OvEditor/Panels/GameView.cpp index 2256b069..c04527ad 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Panels/GameView.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Panels/GameView.cpp @@ -33,6 +33,7 @@ void OvEditor::Panels::GameView::Update(float p_deltaTime) { m_camera = cameraComponent->GetCamera(); m_cameraPosition = cameraComponent->owner.transform.GetWorldPosition(); + m_cameraRotation = cameraComponent->owner.transform.GetWorldRotation(); m_hasCamera = true; PrepareCamera(); } diff --git a/Sources/Overload/OvGame/src/OvGame/Core/GameRenderer.cpp b/Sources/Overload/OvGame/src/OvGame/Core/GameRenderer.cpp index 706ccfc9..3c9de2bc 100644 --- a/Sources/Overload/OvGame/src/OvGame/Core/GameRenderer.cpp +++ b/Sources/Overload/OvGame/src/OvGame/Core/GameRenderer.cpp @@ -66,9 +66,10 @@ void OvGame::Core::GameRenderer::RenderScene() auto [winWidth, winHeight] = m_context.window->GetSize(); const auto& cameraPosition = mainCameraComponent->owner.transform.GetWorldPosition(); + const auto& cameraRotation = mainCameraComponent->owner.transform.GetWorldRotation(); auto& camera = mainCameraComponent->GetCamera(); - camera.CacheMatrices(winWidth, winHeight, cameraPosition); + camera.CacheMatrices(winWidth, winHeight, cameraPosition, cameraRotation); UpdateEngineUBO(*mainCameraComponent); diff --git a/Sources/Overload/OvMaths/include/OvMaths/FQuaternion.h b/Sources/Overload/OvMaths/include/OvMaths/FQuaternion.h index 2c840ff1..610e6bd4 100644 --- a/Sources/Overload/OvMaths/include/OvMaths/FQuaternion.h +++ b/Sources/Overload/OvMaths/include/OvMaths/FQuaternion.h @@ -76,6 +76,13 @@ namespace OvMaths */ FQuaternion(const FVector3& p_euler); + /** + * Create a quaternion from a forward and up vector + * @param p_forward + * @param p_up + */ + static FQuaternion LookAt(const FVector3& p_forward, const FVector3& p_up); + /** * Check if the quaternion is Identity * if the quaternion has no rotation(meaning x,y,z axis values = 0), it's Identity diff --git a/Sources/Overload/OvMaths/src/OvMaths/FQuaternion.cpp b/Sources/Overload/OvMaths/src/OvMaths/FQuaternion.cpp index 2d1a5fa0..2f001be0 100644 --- a/Sources/Overload/OvMaths/src/OvMaths/FQuaternion.cpp +++ b/Sources/Overload/OvMaths/src/OvMaths/FQuaternion.cpp @@ -171,6 +171,63 @@ OvMaths::FQuaternion::FQuaternion(const FVector3 & p_euler) w = cr * cp * cy + sr * sp * sy; } +OvMaths::FQuaternion OvMaths::FQuaternion::LookAt(const FVector3& p_forward, const FVector3& p_up) +{ + auto vector = OvMaths::FVector3::Normalize(p_forward); + auto vector2 = OvMaths::FVector3::Normalize(OvMaths::FVector3::Cross(p_up, vector)); + auto vector3 = OvMaths::FVector3::Cross(vector, vector2); + auto m00 = vector2.x; + auto m01 = vector2.y; + auto m02 = vector2.z; + auto m10 = vector3.x; + auto m11 = vector3.y; + auto m12 = vector3.z; + auto m20 = vector.x; + auto m21 = vector.y; + auto m22 = vector.z; + + + float num8 = (m00 + m11) + m22; + auto quaternion = OvMaths::FQuaternion::Identity(); + if (num8 > 0.f) + { + auto num = sqrt(num8 + 1.f); + quaternion.w = num * 0.5f; + num = 0.5f / num; + quaternion.x = (m12 - m21) * num; + quaternion.y = (m20 - m02) * num; + quaternion.z = (m01 - m10) * num; + return quaternion; + } + if ((m00 >= m11) && (m00 >= m22)) + { + auto num7 = sqrt(((1.f + m00) - m11) - m22); + auto num4 = 0.5f / num7; + quaternion.x = 0.5f * num7; + quaternion.y = (m01 + m10) * num4; + quaternion.z = (m02 + m20) * num4; + quaternion.w = (m12 - m21) * num4; + return quaternion; + } + if (m11 > m22) + { + auto num6 = sqrt(((1.f + m11) - m00) - m22); + auto num3 = 0.5f / num6; + quaternion.x = (m10 + m01) * num3; + quaternion.y = 0.5f * num6; + quaternion.z = (m21 + m12) * num3; + quaternion.w = (m20 - m02) * num3; + return quaternion; + } + auto num5 = sqrt(((1.f + m22) - m00) - m11); + auto num2 = 0.5f / num5; + quaternion.x = (m20 + m02) * num2; + quaternion.y = (m21 + m12) * num2; + quaternion.z = 0.5f * num5; + quaternion.w = (m01 - m10) * num2; + return quaternion; +} + bool OvMaths::FQuaternion::IsIdentity(const FQuaternion & p_target) { return p_target.w == 1.0f && Length(p_target) == 1.0f; @@ -327,6 +384,11 @@ OvMaths::FVector3 OvMaths::FQuaternion::RotatePoint(const FVector3 & p_point, co OvMaths::FVector3 OvMaths::FQuaternion::EulerAngles(const FQuaternion& p_target) { + // This is a kind of hack because when the input Quaternion is {0.5f, 0.5f, -0.5f, 0.5f} or + // {0.5f, 0.5f, 0.5f, -0.5f}, the output value is incorrect. + if (p_target == FQuaternion{0.5f, 0.5f, -0.5f, 0.5f}) return { 90.0f, 90.0f, 0.0f }; + if (p_target == FQuaternion{0.5f, 0.5f, 0.5f, -0.5f}) return { -90.0f, -90.0f, 0.0f }; + // roll (x-axis rotation) const float sinr_cosp = +2.0f * (p_target.w * p_target.x + p_target.y * p_target.z); const float cosr_cosp = +1.0f - 2.0f * (p_target.x * p_target.x + p_target.y * p_target.y); diff --git a/Sources/Overload/OvRendering/include/OvRendering/LowRenderer/Camera.h b/Sources/Overload/OvRendering/include/OvRendering/LowRenderer/Camera.h index 36a08dac..cccfc5ec 100644 --- a/Sources/Overload/OvRendering/include/OvRendering/LowRenderer/Camera.h +++ b/Sources/Overload/OvRendering/include/OvRendering/LowRenderer/Camera.h @@ -10,6 +10,8 @@ #include #include +#include + #include "OvRendering/API/Export.h" #include "OvRendering/Data/Frustum.h" @@ -23,16 +25,18 @@ namespace OvRendering::LowRenderer public: /** * Constructor + * @param p_transform */ - Camera(); + Camera(OvMaths::FTransform* p_transform = nullptr); /** * Cache the projection, view and frustum matrices * @param p_windowWidth * @param p_windowHeight * @param p_position + * @param p_rotation */ - void CacheMatrices(uint16_t p_windowWidth, uint16_t p_windowHeight, const OvMaths::FVector3& p_position); + void CacheMatrices(uint16_t p_windowWidth, uint16_t p_windowHeight, const OvMaths::FVector3& p_position, const OvMaths::FQuaternion& p_rotation); /** * Calculate and cache the result projection matrix @@ -44,8 +48,9 @@ namespace OvRendering::LowRenderer /** * Calculate and cache the result view matrix * @param p_position + * @param p_rotation */ - void CacheViewMatrix(const OvMaths::FVector3& p_position); + void CacheViewMatrix(const OvMaths::FVector3& p_position, const OvMaths::FQuaternion& p_rotation); /** * Calculate and cache the result frustum. @@ -55,36 +60,6 @@ namespace OvRendering::LowRenderer */ void CacheFrustum(const OvMaths::FMatrix4& p_view, const OvMaths::FMatrix4& p_projection); - /** - * Returns the forward vector of the camera - */ - const OvMaths::FVector3& GetForward() const; - - /** - * Returns the up vector of the camera - */ - const OvMaths::FVector3& GetUp() const; - - /** - * Returns the right vector of the camera - */ - const OvMaths::FVector3& GetRight() const; - - /** - * Returns the yaw of the camera - */ - float GetYaw() const; - - /** - * Returns the pitch of the camera - */ - float GetPitch() const; - - /** - * Returns the roll of the camera - */ - float GetRoll() const; - /** * Returns the fov of the camera */ @@ -130,24 +105,6 @@ namespace OvRendering::LowRenderer */ bool HasFrustumLightCulling() const; - /** - * Sets the yaw of the camera to the given value - * @param p_value - */ - void SetYaw(float p_value); - - /** - * Sets the pitch of the camera to the given value - * @param p_value - */ - void SetPitch(float p_value); - - /** - * Sets the roll of the camera to the given value - * @param p_value - */ - void SetRoll(float p_value); - /** * Sets the fov of the camera to the given value * @param p_value @@ -184,30 +141,15 @@ namespace OvRendering::LowRenderer */ void SetFrustumLightCulling(bool p_enable); - /** - * Sets the rotation to the camera with a quaternion - * @param p_rotation - */ - void SetRotation(const OvMaths::FQuaternion& p_rotation); - private: OvMaths::FMatrix4 CalculateProjectionMatrix(uint16_t p_windowWidth, uint16_t p_windowHeight) const; - OvMaths::FMatrix4 CalculateViewMatrix(const OvMaths::FVector3& p_position) const; - void UpdateCameraVectors(); + OvMaths::FMatrix4 CalculateViewMatrix(const OvMaths::FVector3& p_position, const OvMaths::FQuaternion& p_rotation) const; private: OvRendering::Data::Frustum m_frustum; OvMaths::FMatrix4 m_viewMatrix; OvMaths::FMatrix4 m_projectionMatrix; - OvMaths::FVector3 m_forward; - OvMaths::FVector3 m_up; - OvMaths::FVector3 m_right; - - float m_yaw; - float m_pitch; - float m_roll; - float m_fov; float m_near; float m_far; diff --git a/Sources/Overload/OvRendering/src/OvRendering/LowRenderer/Camera.cpp b/Sources/Overload/OvRendering/src/OvRendering/LowRenderer/Camera.cpp index 7a38d73a..a19bc540 100644 --- a/Sources/Overload/OvRendering/src/OvRendering/LowRenderer/Camera.cpp +++ b/Sources/Overload/OvRendering/src/OvRendering/LowRenderer/Camera.cpp @@ -9,24 +9,20 @@ #include "OvRendering/LowRenderer/Camera.h" #include "OvMaths/FMatrix4.h" -OvRendering::LowRenderer::Camera::Camera() : - m_yaw(-90.f), - m_pitch(0.f), - m_roll(0.f), - m_fov(45.f), +OvRendering::LowRenderer::Camera::Camera(OvMaths::FTransform* p_transform) : + m_fov(45.0f), m_near(0.1f), m_far(100.f), m_clearColor(0.f, 0.f, 0.f), m_frustumGeometryCulling(false), m_frustumLightCulling(false) { - UpdateCameraVectors(); } -void OvRendering::LowRenderer::Camera::CacheMatrices(uint16_t p_windowWidth, uint16_t p_windowHeight, const OvMaths::FVector3& p_position) +void OvRendering::LowRenderer::Camera::CacheMatrices(uint16_t p_windowWidth, uint16_t p_windowHeight, const OvMaths::FVector3& p_position, const OvMaths::FQuaternion& p_rotation) { CacheProjectionMatrix(p_windowWidth, p_windowHeight); - CacheViewMatrix(p_position); + CacheViewMatrix(p_position, p_rotation); CacheFrustum(m_viewMatrix, m_projectionMatrix); } @@ -35,9 +31,9 @@ void OvRendering::LowRenderer::Camera::CacheProjectionMatrix(uint16_t p_windowWi m_projectionMatrix = CalculateProjectionMatrix(p_windowWidth, p_windowHeight); } -void OvRendering::LowRenderer::Camera::CacheViewMatrix(const OvMaths::FVector3& p_position) +void OvRendering::LowRenderer::Camera::CacheViewMatrix(const OvMaths::FVector3& p_position, const OvMaths::FQuaternion& p_rotation) { - m_viewMatrix = CalculateViewMatrix(p_position); + m_viewMatrix = CalculateViewMatrix(p_position, p_rotation); } void OvRendering::LowRenderer::Camera::CacheFrustum(const OvMaths::FMatrix4& p_view, const OvMaths::FMatrix4& p_projection) @@ -45,36 +41,6 @@ void OvRendering::LowRenderer::Camera::CacheFrustum(const OvMaths::FMatrix4& p_v m_frustum.CalculateFrustum(p_projection * p_view); } -const OvMaths::FVector3 & OvRendering::LowRenderer::Camera::GetForward() const -{ - return m_forward; -} - -const OvMaths::FVector3 & OvRendering::LowRenderer::Camera::GetUp() const -{ - return m_up; -} - -const OvMaths::FVector3 & OvRendering::LowRenderer::Camera::GetRight() const -{ - return m_right; -} - -float OvRendering::LowRenderer::Camera::GetYaw() const -{ - return m_yaw; -} - -float OvRendering::LowRenderer::Camera::GetPitch() const -{ - return m_pitch; -} - -float OvRendering::LowRenderer::Camera::GetRoll() const -{ - return m_roll; -} - float OvRendering::LowRenderer::Camera::GetFov() const { return m_fov; @@ -120,27 +86,6 @@ bool OvRendering::LowRenderer::Camera::HasFrustumLightCulling() const return m_frustumLightCulling; } -void OvRendering::LowRenderer::Camera::SetYaw(float p_value) -{ - m_yaw = p_value; - while (m_yaw > 180.0f) m_yaw -= 360.0f; - UpdateCameraVectors(); -} - -void OvRendering::LowRenderer::Camera::SetPitch(float p_value) -{ - m_pitch = p_value; - while (m_pitch > 180.0f) m_pitch -= 360.0f; - UpdateCameraVectors(); -} - -void OvRendering::LowRenderer::Camera::SetRoll(float p_value) -{ - m_roll = p_value; - while (m_roll > 180.0f) m_roll -= 360.0f; - UpdateCameraVectors(); -} - void OvRendering::LowRenderer::Camera::SetFov(float p_value) { m_fov = p_value; @@ -171,35 +116,20 @@ void OvRendering::LowRenderer::Camera::SetFrustumLightCulling(bool p_enable) m_frustumLightCulling = p_enable; } -void OvRendering::LowRenderer::Camera::SetRotation(const OvMaths::FQuaternion & p_rotation) -{ - m_forward = p_rotation * OvMaths::FVector3(0.f, 0.f, 1.f); - m_right = p_rotation * OvMaths::FVector3(1.f, 0.f, 0.f); - m_up = p_rotation * OvMaths::FVector3(0.f, 1.f, 0.f); -} - OvMaths::FMatrix4 OvRendering::LowRenderer::Camera::CalculateProjectionMatrix(uint16_t p_windowWidth, uint16_t p_windowHeight) const { return OvMaths::FMatrix4::CreatePerspective(m_fov, static_cast(p_windowWidth) / static_cast(p_windowHeight), m_near, m_far); } -OvMaths::FMatrix4 OvRendering::LowRenderer::Camera::CalculateViewMatrix(const OvMaths::FVector3& p_position) const +OvMaths::FMatrix4 OvRendering::LowRenderer::Camera::CalculateViewMatrix(const OvMaths::FVector3& p_position, const OvMaths::FQuaternion& p_rotation) const { + const auto& up = p_rotation * OvMaths::FVector3::Up; + const auto& forward = p_rotation * OvMaths::FVector3::Forward; + return OvMaths::FMatrix4::CreateView ( - p_position.x, p_position.y, p_position.z, // Position - p_position.x + m_forward.x, p_position.y + m_forward.y, p_position.z + m_forward.z, // LookAt (Position + Forward) - m_up.x, m_up.y, m_up.z // Up Vector + p_position.x, p_position.y, p_position.z, // Position + p_position.x + forward.x, p_position.y + forward.y, p_position.z + forward.z, // LookAt (Position + Forward) + up.x, up.y, up.z // Up Vector ); -} - -void OvRendering::LowRenderer::Camera::UpdateCameraVectors() -{ - m_forward.x = std::cos(m_yaw * 0.0174f) * std::cos(m_pitch * 0.0174f); - m_forward.y = std::sin(m_pitch * 0.0174f); - m_forward.z = std::sin(m_yaw * 0.0174f) * std::cos(m_pitch * 0.0174f); - - m_forward = OvMaths::FVector3::Normalize(m_forward); - m_right = OvMaths::FVector3::Normalize(OvMaths::FVector3::Cross(m_forward, OvMaths::FVector3(0.0f, 1.0f, 0.0f))); - m_up = OvMaths::FVector3::Normalize(OvMaths::FVector3::Cross(m_right, m_forward)); } \ No newline at end of file diff --git a/Sources/Overload/OvTools/include/OvTools/Utils/ReferenceOrValue.h b/Sources/Overload/OvTools/include/OvTools/Utils/ReferenceOrValue.h index 8436367a..6cabe27f 100644 --- a/Sources/Overload/OvTools/include/OvTools/Utils/ReferenceOrValue.h +++ b/Sources/Overload/OvTools/include/OvTools/Utils/ReferenceOrValue.h @@ -57,7 +57,7 @@ namespace OvTools::Utils /** * Implicit conversion of a ReferenceOrValue to a T */ - operator T() + operator T&() { return Get(); } @@ -75,7 +75,7 @@ namespace OvTools::Utils /** * Returns the value (From reference or directly from the value) */ - T Get() const + T& Get() const { if (auto pval = std::get_if(&m_data)) return *pval; From 4c1824dca5080763636f21cc0691eda508fa87c8 Mon Sep 17 00:00:00 2001 From: Adrien GIVRY Date: Tue, 3 Mar 2020 23:40:53 -0500 Subject: [PATCH 10/46] Adding a feedback when hovering an actor or a gizmo Picking a gizmo axis was sometimes tricky as the collider was small. The collider has been changed for a bigger and less error-prone one (Arrow_Picking model). In order to give our users more feedback about their actions, an highlight outline has been added. This outline will be shown everytime an actor or a gizmo axis is under the mouse cursor. --- Resources/Editor/Models/Arrow_Picking.fbx | Bin 0 -> 25404 bytes .../include/OvEditor/Core/EditorRenderer.h | 11 +- .../include/OvEditor/Core/GizmoBehaviour.h | 10 +- .../include/OvEditor/Panels/SceneView.h | 3 + .../src/OvEditor/Core/EditorRenderer.cpp | 96 ++++++++++-------- .../src/OvEditor/Core/EditorResources.cpp | 1 + .../src/OvEditor/Core/GizmoBehaviour.cpp | 6 ++ .../src/OvEditor/Panels/SceneView.cpp | 72 +++++++++---- .../src/OvEditor/Resources/RawShaders.cpp | 10 +- 9 files changed, 146 insertions(+), 63 deletions(-) create mode 100644 Resources/Editor/Models/Arrow_Picking.fbx diff --git a/Resources/Editor/Models/Arrow_Picking.fbx b/Resources/Editor/Models/Arrow_Picking.fbx new file mode 100644 index 0000000000000000000000000000000000000000..53be90a97b39f11477a6c05253ca6526dc994345 GIT binary patch literal 25404 zcmc&-d3+Q_zVARF;l2bF5uyT$a)d)fKxQTx5=Ih|%_In}ibK*#MkX_H4oFx5Syc3? z;JM2#;(aZy>+oPM`zq0r+X^&;Mlsb?hknb z{u^*J4WAbHbd27fs0Zn$>&NDrR;QF`jS|K^B44E3Yd_Xs9;~ko16NvKtGjSZn@iMu zbjl6t9&y)Oqr1bNn%XV6W7M4yrA3vyl^f}kbx+Xs9i%v+Ty0Sp@Q15iD64e>g~8I? z>8TeNFI6t4j|)VCu5(e;rd(}V==Dd!x+@*muT!tP_40tf!qo=X!^-tGgt_Ul6(MnFpL(Z6pYA1R6nC1Tr6iybAvaJ{qx)qgL>N6> ziqE$#4hCxVVA!jNuF4JoPSC6INh@}fjh%t=2(gp}eQtt{cZY*sf0dh5Lf7!6iGqVF z15kf(VCB@h6-+Z4_dwI0iUiA>!bBa6Jg~Q9B5M@|y;bPKK4ChDSR07=D`YcpR~w7s zBtii`sJlD948(1Y+FGBtTy(ODa69N(l?Wv@$zpTORY;d{k*68>|e)hx1-EBd`M|(M7xb<)t5iK-^ zDxNx}u2rAtVA6OH%)yireb>5JOj$VXbiUTfxSg+D$Om~qK8yPl0 z!dk~*-YUN}v^jbQ)!1J`sjuV(G1OaEis3?YFfv;rDOALeN$dSX<9c%g7>}&$MIG9T z#`VUKN$WkvXi62JVH!z{0G3SCr*VveZb@BNN;t*!2JoaUn9CF+Bt-{&mHEA4ce%%> z=XuJ*7(~eK6@duS7jZfvQZtp!?Zh1%2W?xJ#g1Q)gIqn@kTYlNg9u8VHBPdTdpc^S zdNE4p27G7`{7VyOCHXlt1jrvEu5*hpuH&*eq9H=1r}WJ+lZ! zjU&$P`3P4OC>;2}?qts75#q0Zp<|!T+34h9rW+&as7n_ILPFW1Ura>L=gEtk^x<&g zA8|B1alNynF;`hF6Ob{IaviiqNrxiQATh}gASR_9H0TEPP`HWh)3hqEkiPm#&UAd0 z1bjXby2J@CXbq%%g)t)~hAdZv2|tF4T*PKQI7tp*@s|?t98JPAxiQaVcLE+4vU1W3 zDGGX_u`37twkk+-8tDizmr(HiZdkbH$YtNzoQ+QI03$&LNJjF)(n!!>N^|#ygI@#X ztYs(<Tseu5`EKy2x(Lcu-emTw|3-uz*>I(zZ({p^0pc!ry z`X9BJhXhJbfh*BHJ{lRU@#MpQWIRua2`@oeRBIOb85WAd^_J2fw5?>C{=l;-9Ac!z zpyCaf4T>nNonquLiNp}8N#u3jig2~nctmJKHM;`=ja0x{5Jnqj7^i!ys>8`Cy!N}9 zg0(2V!yG8qxKcl%RM6so3FKrcu0+Xz~KV8c*1T1-ZIJDH`h4?ubW~icX}YH``wWQpRE41jOX}A z0gU9Q`X_pPk!0cXIK!3rXTXbsSV1*2*bvM$NNtoNpv#HQPwRb=plK>j)5Qvg^_DOi zMe<>!Jj{G(C~T0tkgueK39J z#Gu3eG=mj=%Op*9E;H?Y$uPyd7^cLuLk`rW^#sG>KrB!xsgHc1p z6Aw5^hkfvYC8>|Qs{=Dcx}TsKG)g|k5Y7u|d>{y|#TWSt1Jh~6*aW&Iac%iQZ-p78 z4OVrjfdlbD1Cbes+TwDpL|By5?2NrsVo71tQpZehO+@;311*zyGZ>^8l|Yn1*Eu1E#KbOLn{M#EyJ=xsQKY}7snm5&)zX2wIEBHk)#vXjts@QIQj z+d)bSQ%1iD*fuKmdHj|$T0y7vw$EWa$1d`Syj0=#SM00e;TQ=aQy3!E)MEaV>+{wY zqah(Pl^ka{_ebPI8if?utx5w0fxt9}sp+o4LL-UJVF@8dfb)Ww*GFnd3sFf-EOI+D zTnQ*Ff{v;(P(m&AXqLlKG+i4{K@JaHUPm!HE<`wFDeif}Cc8K0tDGDhQNMi$W6gLwirD zJEcy77<0r4p6T8yN}Wt6A0Z}C>cmLss_|6GwX6hnKFyGeWHZUPaVI)2s{_7@VhiKAN77gk?F^~S1UhBK_2~o*$&#^BX5c;@*C9&+Vd)HH zgvJ9sE{fyPtT?CYfQwNvL_Tbt&>pmXnvB3&h=aC{@Ga6YXYte>W9G~%)$1t96P9ea zwpR!w1rsHr8XZ~Wc&46BUUV0OufRFHNF?I42Z8W`U~b{#|6-t$B*bd9_V&{Z&6agy z8X1imVLhqekGoikJ4&KO+zJGBxek(5RO=}>Ch$p?@#iv;B09OekiydE*D+A>H$!y4 zo|@BVAT*H8EGVoU27C8R!DB#t{7%vB?`ICB_r@ei$?vx$Ww4gxpsiK!Mvjl{+OVgU znDkya?s?RO${qfs-g|0ifNM7}hZZCsF5s)Tq>83fE&9 zEgd%+%&(~1wa4H?O&^U9x*c@^1Ac~!2;-Sa>HU~%3~?5Es{GzcuO7TU5U4SeVgZ8{ zHyq;3ibAsl)+%yNwr^&NAyN_wAaNAdfzxGgk1>xlVTQMMAD6w5@rog2E{RokdMXEr zfLQlWUnX9L31XfQAE!#Wy_M6OubYiQEnawc8lQxs#Y+63XGP;w4{8aogJ8VFC_1 zV%>uX;_^jH4zK;UghD&~VXw#M^@L1jm(=_`NK5J(gAau6iZ2xwzkF-bifun!y>Hg8 zy|#JGrSuz>3lD}>2jrZ!LH9+a+FAy)(^5lVH%B?1u8Lsbq*d%lCAPQBtk)8APZEUt zos8Y|s1Y6%^g#h)-_ZQwfeb)%m_nI0ivT*8??r zI9UHInn7hq8fCllX@=6WPviYAYCrb73Xz^ZN~13yal2htA`_)@4t!v1;*ZUm#aV*= z@J5?l(QU8!Oy`tzLW4PhIy@ICmPAsWhDYb)n)ZbWqo=N^jNPCMl2dWX;-I&N9&nwA zrvj&XeU#ZyAZsv1Ap=ZcFj__WBAeyn!K+Y~yV_F`n2~TkPPn@nr-Yyqy3l;(N9J!nA#7outQSjJhp5beE=Ktbb(b0IHeqFR(*`nw3y+MpjD zRLmD^1JSunf?mD`cyg5S_&}vJv>ADo%<`IQ=@cbdhb5O z(!#08n>yetzQvQwWW53bf%IgGoNR{FlOeA+Lq1`R^wgQQ_KRdl)7ExD5@jK$r_Qvs z;~A+0Kchog?x!qdoU)E);P9MMxsHiQfw#sRF7o>l23{CN`6$D8O4C3D{)6hszw)xCMoM8X3axk=!Eh&Vl~F7hQAweCK{nW2Pb(oFE>$^rYzev z_?dw53an!hek?v{Q@1!go=q0%rFgi+;+Ej0f5clSbdtic0cs$xr9o9)qRYhZLRv7x z%KZJj97iow7JA=eC}k;)7kbI+Sm<>}f|Zy}7gq=TRsSHB^AWdN*Uc`)$E=aWC%e+p zB^Iy5Dxt{>OVk{}JD%Z}N;s*z5N|tq3q1Aa>+p*KBInAHAd-J9 zlH9Gnvd6gq#Uz7IdA-c+F@%G*%N?>k_%d`5_byn%=Ez0wjm9e;%83^|1Ywnucubd4 zYnC@|jS~wRk&u;g%$MMgHf{~mrPP{hVI;EESg9L|+#2Y?Sj7R*-soi^fWw zDlyBAw=}Wu7_^94=0Rd1_(+jFY*EZI_>@MO`|*2>9{?Z>L4NG6##?)|?kSQDGw3jT zJNQ0TjYR{3l6yp4^g zHY?fLGb=w{O*@X|Z&cQdEr zD6!}3n&c?!!ARcAqbp@VGGruw2QG~Sb4fVakv&&=^e6fRY=eEtW+OghA#+vBzdo=If{;ESZ@iVIB4-+54p~4MkubMyo6)*UeD*92ixXt z%C)ay2F{tNsS1Pjdp!n6%K|BGVh-!~dY=6#v})_gk#-kzsD^9sUXQimT=s{V0&{iJ zdKY}1;X`;m*58W%PS`$TCZ#i^`V?8#$Bql_T@ay_F_=12s;_ha*4tjfcn(Dr$fGYp z(D>O{6S&Be?Yr077c-o5DH?~PPd_81#olOW%%k`*h=?_MYy>OaZi7!N+7`+4d8%Ye zAjhR2xByAs!FZs^_|s^&;bM0zD3G7i@=2x<`6+;FiN_$PQodPPttgpzgb6AoTgqi4 zDxKBw@NO|4-P|RkY7AYmXSw#+9zki6gc{nBmVMM$p~OV{6{SQgDj{C;L5S3}ZGx zM#Y=+dZ+@yLx}bTzU$Iz9vIwujlJX8qupNb>6|pG(|@#X{r=u;;=TbDZ92WyrO(W? zK-ROJf|-M!Jh$V*ohMwCzy5u~gPt9yPMjRN`MLjE=-oE`g@u0}Gkd^id)J=)Zo_S3 zs@v~;dPnxTCtbh#Z@u8b4nN*H=*X@uD<6Jw&Idi}uV3Np`TfC+{GQ)$c;-Y=&ySuN z|J>*idk!zn8T0xR=Phk^c=z%8#|I6qef+u|t;+Tud9&ByS2xcbRD5FXjU$iGTifgF z*7Y-Id1kJxIzD*Ts$Rc*c5=}Zkx$ol_-)LbFKx>|n09)_kGI_0V_E+lr`mMC>A^1j zekX`>%?lEH=C7kgHXbN1!LQ%JKCcH^QSt4hYqTt7H+KewX<^|TmUQKg5xmvGf%Mb+)r&TX9wJH0c1 z>)ra7-E#VN`||YZ?FW9y$-HRD@WEFOJzDAU>if67JOAaPDXaGXbYYJrkKK4;`I{?_ zA36BHzwGI?a76R;m6$deU8A#DYZ>bkb2~Yg6+PfRZU^~F^iOx___0&DkuKgy#6|5~ zw3jF;q3VXoa4nXAsKe3g%*NBaG}`CX$LThoVH9r8i~ezuhCqsjPHzzNgIBoarKl@I zwl-Ap0B%#=`S_2Euocvx((w};D#67PTr|%iIctZOdzwSM6=gx~;L_WAU zbHb^N0}HIY(eq!f_ot^_ z`u2#)`;Q&)KXKQZEe}f?ohvxT~vmtl#ihuvB*N9`y^N(M0+s_NX-&Lgh zYnRXX;^?XB&Hb<5le2HulF-kaj$Lx&uWRqK&FnR2Y4F~8wlzmiZ9R19FBcXqIyArM zdz;#|f4p|p4|9GQbUN+O6C>_`He<&_WifYYuewXwMByq&6nBbqmCmIS*cM#URVdr3 zkblz1#W&B;V{T_yXE2$2Ogr2a{kAk99j6z|K)%wfY+}VQe3Q@2!>2ASf|z!DcH6O` zS08`+t^Ck|1D(EpYx#(-j*gClna_WianX~x?@yaOdsU|gFWS@Zo>?#Nc<-|gJ5J8( zueUj}yZoiq6Q}15pR?aKYxU(H-nw|gjt^hiKIQQKxf_e-v^$l5^NA1LSABZhrlCtV zFJ3!((a8D@@6SHCYtH?jES&Y=Gc)JBvG7kl+s&Hrmpi$6)ax^#R{8?~(U2qi{eX8f zTHkIzXWiDojQx7e(bX@Wzv!KL!#aJKQ~12?)jaV4y#-wC% zvoJtD;K1K;!34OFi=Uw}!wl;LrdCFCLte5c9b){Hr?G#3yDlbf3n8wMZ<(TnsC*TG zU4Zh&(NI8`M-b zF`Q~G`^{=u#|-C3YoQ*g%42AFXR37pZ*qL|dztg}#r+myi=bd}o0h|=G(Y`Jf9Fg~ zle-5L_hl+I3AqxPH*PfAiwhMXG>*8$=K~WyK_ma{rAjR>#;lU-4^P%xWB_bgIV(=D-DTfw7oT1tm|ZHnmpNg`t&6G z+u$Uf@qD{0PS0>N5(w=uvs{LA%(mUmSSc{-POrTv9YvNVYRt5tZI_=a7NOsI($_T#29auy>y zIYn!l!i+*@ZL~fbiK&avzmZ7f5!c0+0zqB8Dcx}MhQA&D}U4%%b>a3f<6VFNXg@WZ{)hO_8`#J!@vH}2%V>1eGsyeu_y)OU+qiva zQnuJ(eni1G6gVI4F^)LLIsuT#QgD}7_LA?RqHI>TZr{rV@wk%$Bwj?9Bk3qNH8z;7 z*RW0a?gJkQ$U%bwtHGDTR)?m2#qDv(_E4^te8U=r?Ebb(g?RBN-EWr787%2Yywo?W z5$yqQpdDi?t4Z2uG@BBW8cfrDP}hiUL^VksFr;$0rp8LO$qo4ZayKpXBpO7^ap&Wcmg}Y-TvQZIx(W=? z`h>-d2p%nVAYrjSys;If?TW@UuGCoCDllkACoEo|7(eYb2s^2O|* N_O;y=S=g`5{{clr7YqOZ literal 0 HcmV?d00001 diff --git a/Sources/Overload/OvEditor/include/OvEditor/Core/EditorRenderer.h b/Sources/Overload/OvEditor/include/OvEditor/Core/EditorRenderer.h index 1c771d73..5ab6e096 100644 --- a/Sources/Overload/OvEditor/include/OvEditor/Core/EditorRenderer.h +++ b/Sources/Overload/OvEditor/include/OvEditor/Core/EditorRenderer.h @@ -85,8 +85,9 @@ namespace OvEditor::Core * @param p_rotation * @param p_operation * @param p_pickable (Determine the shader to use to render the gizmo) + * @param p_highlightedAxis (-1 to highlight no axis, 0 for X, 1 for Y, 2 for Z) */ - void RenderGizmo(const OvMaths::FVector3& p_position, const OvMaths::FQuaternion& p_rotation, OvEditor::Core::EGizmoOperation p_operation, bool p_pickable = false); + void RenderGizmo(const OvMaths::FVector3& p_position, const OvMaths::FQuaternion& p_rotation, OvEditor::Core::EGizmoOperation p_operation, bool p_pickable, int p_highlightedAxis = -1); /** * Render a model to the stencil buffer @@ -95,15 +96,19 @@ namespace OvEditor::Core /** * Render a model outline using the data stored in the stencil buffer + * @param p_worldMatrix + * @param p_model + * @param p_width */ - void RenderModelOutline(const OvMaths::FMatrix4& p_worldMatrix, OvRendering::Resources::Model& p_model); + void RenderModelOutline(const OvMaths::FMatrix4& p_worldMatrix, OvRendering::Resources::Model& p_model, float p_width); /** * Render the actor as a selected actor (Outline) * @param p_actor * @param p_toStencil + * @param p_isSelected */ - void RenderActorAsSelected(OvCore::ECS::Actor& p_actor, bool p_toStencil); + void RenderActorOutlinePass(OvCore::ECS::Actor& p_actor, bool p_toStencil, bool p_isSelected = false); /** * Render the camera frustum diff --git a/Sources/Overload/OvEditor/include/OvEditor/Core/GizmoBehaviour.h b/Sources/Overload/OvEditor/include/OvEditor/Core/GizmoBehaviour.h index b8364f29..a760485f 100644 --- a/Sources/Overload/OvEditor/include/OvEditor/Core/GizmoBehaviour.h +++ b/Sources/Overload/OvEditor/include/OvEditor/Core/GizmoBehaviour.h @@ -6,7 +6,10 @@ #pragma once -#include +#include +#include + +#include namespace OvEditor::Core { @@ -66,6 +69,11 @@ namespace OvEditor::Core */ bool IsPicking() const; + /** + * Returns the current operation direction + */ + EDirection GetDirection() const; + private: /** * Returns the global direction matching with the current m_direction diff --git a/Sources/Overload/OvEditor/include/OvEditor/Panels/SceneView.h b/Sources/Overload/OvEditor/include/OvEditor/Panels/SceneView.h index a5cc74d3..78b40289 100644 --- a/Sources/Overload/OvEditor/include/OvEditor/Panels/SceneView.h +++ b/Sources/Overload/OvEditor/include/OvEditor/Panels/SceneView.h @@ -58,5 +58,8 @@ namespace OvEditor::Panels OvRendering::Buffers::Framebuffer m_actorPickingFramebuffer; OvEditor::Core::GizmoBehaviour m_gizmoOperations; OvEditor::Core::EGizmoOperation m_currentOperation = OvEditor::Core::EGizmoOperation::TRANSLATE; + + std::optional> m_highlightedActor; + std::optional m_highlightedGizmoDirection; }; } \ No newline at end of file diff --git a/Sources/Overload/OvEditor/src/OvEditor/Core/EditorRenderer.cpp b/Sources/Overload/OvEditor/src/OvEditor/Core/EditorRenderer.cpp index 64af3162..71ce2e73 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Core/EditorRenderer.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Core/EditorRenderer.cpp @@ -111,7 +111,6 @@ void OvEditor::Core::EditorRenderer::InitMaterials() /* Outline Material */ m_outlineMaterial.SetShader(m_context.shaderManager[":Shaders\\Unlit.glsl"]); - m_outlineMaterial.Set("u_Diffuse", FVector4(1.f, 1.f, 0.f, 1.0f)); m_outlineMaterial.Set("u_DiffuseMap", nullptr); m_outlineMaterial.SetDepthTest(false); @@ -311,31 +310,36 @@ void OvEditor::Core::EditorRenderer::RenderLights() } } -void OvEditor::Core::EditorRenderer::RenderGizmo(const OvMaths::FVector3& p_position, const OvMaths::FQuaternion& p_rotation, OvEditor::Core::EGizmoOperation p_operation, bool p_pickable) +void OvEditor::Core::EditorRenderer::RenderGizmo(const OvMaths::FVector3& p_position, const OvMaths::FQuaternion& p_rotation, OvEditor::Core::EGizmoOperation p_operation, bool p_pickable, int p_highlightedAxis) { using namespace OvMaths; FMatrix4 model = FMatrix4::Translation(p_position) * FQuaternion::ToMatrix4(FQuaternion::Normalize(p_rotation)); + OvRendering::Resources::Model* arrowModel = nullptr; + if (!p_pickable) { FMatrix4 sphereModel = model * OvMaths::FMatrix4::Scaling({ 0.1f, 0.1f, 0.1f }); m_context.renderer->DrawModelWithSingleMaterial(*m_context.editorResources->GetModel("Sphere"), m_gizmoBallMaterial, &sphereModel); - } + m_gizmoArrowMaterial.Set("u_HighlightedAxis", p_highlightedAxis); - OvRendering::Resources::Model* arrowModel = nullptr; - - switch (p_operation) + switch (p_operation) + { + case OvEditor::Core::EGizmoOperation::TRANSLATE: + arrowModel = m_context.editorResources->GetModel("Arrow_Translate"); + break; + case OvEditor::Core::EGizmoOperation::ROTATE: + arrowModel = m_context.editorResources->GetModel("Arrow_Rotate"); + break; + case OvEditor::Core::EGizmoOperation::SCALE: + arrowModel = m_context.editorResources->GetModel("Arrow_Scale"); + break; + } + } + else { - case OvEditor::Core::EGizmoOperation::TRANSLATE: - arrowModel = m_context.editorResources->GetModel("Arrow_Translate"); - break; - case OvEditor::Core::EGizmoOperation::ROTATE: - arrowModel = m_context.editorResources->GetModel("Arrow_Rotate"); - break; - case OvEditor::Core::EGizmoOperation::SCALE: - arrowModel = m_context.editorResources->GetModel("Arrow_Scale"); - break; + arrowModel = m_context.editorResources->GetModel("Arrow_Picking"); } if (arrowModel) @@ -351,19 +355,23 @@ void OvEditor::Core::EditorRenderer::RenderModelToStencil(const OvMaths::FMatrix m_context.renderer->SetStencilMask(0x00); } -void OvEditor::Core::EditorRenderer::RenderModelOutline(const OvMaths::FMatrix4& p_worldMatrix, OvRendering::Resources::Model& p_model) +void OvEditor::Core::EditorRenderer::RenderModelOutline(const OvMaths::FMatrix4& p_worldMatrix, OvRendering::Resources::Model& p_model, float p_width) { m_context.renderer->SetStencilAlgorithm(OvRendering::Settings::EComparaisonAlgorithm::NOTEQUAL, 1, 0xFF); m_context.renderer->SetRasterizationMode(OvRendering::Settings::ERasterizationMode::LINE); - m_context.renderer->SetRasterizationLinesWidth(5.f); + m_context.renderer->SetRasterizationLinesWidth(p_width); m_context.renderer->DrawModelWithSingleMaterial(p_model, m_outlineMaterial, &p_worldMatrix); m_context.renderer->SetRasterizationLinesWidth(1.f); m_context.renderer->SetRasterizationMode(OvRendering::Settings::ERasterizationMode::FILL); m_context.renderer->SetStencilAlgorithm(OvRendering::Settings::EComparaisonAlgorithm::ALWAYS, 1, 0xFF); } -void OvEditor::Core::EditorRenderer::RenderActorAsSelected(OvCore::ECS::Actor& p_actor, bool p_toStencil) +void OvEditor::Core::EditorRenderer::RenderActorOutlinePass(OvCore::ECS::Actor& p_actor, bool p_toStencil, bool p_isSelected) { + float outlineWidth = p_isSelected ? 5.0f : 2.5f; + + m_outlineMaterial.Set("u_Diffuse", p_isSelected ? FVector4(1.f, 0.7f, 0.f, 1.0f) : FVector4(1.f, 1.f, 0.f, 1.0f)); + if (p_actor.IsActive()) { /* Render static mesh outline and bounding spheres */ @@ -372,9 +380,9 @@ void OvEditor::Core::EditorRenderer::RenderActorAsSelected(OvCore::ECS::Actor& p if (p_toStencil) RenderModelToStencil(p_actor.transform.GetWorldMatrix(), *modelRenderer->GetModel()); else - RenderModelOutline(p_actor.transform.GetWorldMatrix(), *modelRenderer->GetModel()); + RenderModelOutline(p_actor.transform.GetWorldMatrix(), *modelRenderer->GetModel(), outlineWidth); - if (Settings::EditorSettings::ShowGeometryBounds) + if (p_isSelected && Settings::EditorSettings::ShowGeometryBounds && !p_toStencil) { RenderBoundingSpheres(*modelRenderer); } @@ -388,38 +396,46 @@ void OvEditor::Core::EditorRenderer::RenderActorAsSelected(OvCore::ECS::Actor& p if (p_toStencil) RenderModelToStencil(model, *m_context.editorResources->GetModel("Camera")); else - RenderModelOutline(model, *m_context.editorResources->GetModel("Camera")); + RenderModelOutline(model, *m_context.editorResources->GetModel("Camera"), outlineWidth); - RenderCameraFrustum(*cameraComponent); + if (p_isSelected && !p_toStencil) + { + RenderCameraFrustum(*cameraComponent); + } } - /* Render the actor collider */ - if (p_actor.GetComponent() && !p_toStencil) + if (p_isSelected && !p_toStencil) { - RenderActorCollider(p_actor); - } + /* Render the actor collider */ + if (p_actor.GetComponent()) + { + RenderActorCollider(p_actor); + } - /* Render the actor ambient light */ - if (auto ambientBoxComp = p_actor.GetComponent(); ambientBoxComp && !p_toStencil) - { - RenderAmbientBoxVolume(*ambientBoxComp); - } + /* Render the actor ambient light */ + if (auto ambientBoxComp = p_actor.GetComponent()) + { + RenderAmbientBoxVolume(*ambientBoxComp); + } - if (auto ambientSphereComp = p_actor.GetComponent(); ambientSphereComp && !p_toStencil) - { - RenderAmbientSphereVolume(*ambientSphereComp); - } + if (auto ambientSphereComp = p_actor.GetComponent()) + { + RenderAmbientSphereVolume(*ambientSphereComp); + } - if (OvEditor::Settings::EditorSettings::ShowLightBounds) - { - if (auto light = p_actor.GetComponent(); light && !p_toStencil) + if (OvEditor::Settings::EditorSettings::ShowLightBounds) { - RenderLightBounds(*light); + if (auto light = p_actor.GetComponent()) + { + RenderLightBounds(*light); + } } } for (auto& child : p_actor.GetChildren()) - RenderActorAsSelected(*child, p_toStencil); + { + RenderActorOutlinePass(*child, p_toStencil, p_isSelected); + } } } diff --git a/Sources/Overload/OvEditor/src/OvEditor/Core/EditorResources.cpp b/Sources/Overload/OvEditor/src/OvEditor/Core/EditorResources.cpp index 884c0271..6a076169 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Core/EditorResources.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Core/EditorResources.cpp @@ -157,6 +157,7 @@ OvEditor::Core::EditorResources::EditorResources(const std::string& p_editorAsse m_models["Arrow_Translate"] = ModelLoader::Create(modelsFolder + "Arrow_Translate.fbx", modelParserFlags); m_models["Arrow_Rotate"] = ModelLoader::Create(modelsFolder + "Arrow_Rotate.fbx", modelParserFlags); m_models["Arrow_Scale"] = ModelLoader::Create(modelsFolder + "Arrow_Scale.fbx", modelParserFlags); + m_models["Arrow_Picking"] = ModelLoader::Create(modelsFolder + "Arrow_Picking.fbx", modelParserFlags); m_models["Camera"] = ModelLoader::Create(modelsFolder + "Camera.fbx", modelParserFlags); /* Shaders */ diff --git a/Sources/Overload/OvEditor/src/OvEditor/Core/GizmoBehaviour.cpp b/Sources/Overload/OvEditor/src/OvEditor/Core/GizmoBehaviour.cpp index c73d79ed..5d2ffe07 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Core/GizmoBehaviour.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Core/GizmoBehaviour.cpp @@ -5,6 +5,7 @@ */ #include "OvEditor/Core/GizmoBehaviour.h" +#include "OvEditor/Core/EditorActions.h" #include "OvEditor/Settings/EditorSettings.h" float SnapValue(float p_value, float p_step) @@ -204,4 +205,9 @@ void OvEditor::Core::GizmoBehaviour::SetCurrentMouse(const OvMaths::FVector2& p_ bool OvEditor::Core::GizmoBehaviour::IsPicking() const { return m_target; +} + +OvEditor::Core::GizmoBehaviour::EDirection OvEditor::Core::GizmoBehaviour::GetDirection() const +{ + return m_direction; } \ No newline at end of file diff --git a/Sources/Overload/OvEditor/src/OvEditor/Panels/SceneView.cpp b/Sources/Overload/OvEditor/src/OvEditor/Panels/SceneView.cpp index b65f883f..8bc0ca04 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Panels/SceneView.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Panels/SceneView.cpp @@ -68,11 +68,10 @@ void OvEditor::Panels::SceneView::_Render_Impl() uint8_t glState = baseRenderer.FetchGLState(); baseRenderer.ApplyStateMask(glState); - - RenderScene(glState); - baseRenderer.ApplyStateMask(glState); HandleActorPicking(); baseRenderer.ApplyStateMask(glState); + RenderScene(glState); + baseRenderer.ApplyStateMask(glState); } void OvEditor::Panels::SceneView::RenderScene(uint8_t p_defaultRenderState) @@ -120,14 +119,29 @@ void OvEditor::Panels::SceneView::RenderScene(uint8_t p_defaultRenderState) if (selectedActor.IsActive()) { - m_editorRenderer.RenderActorAsSelected(selectedActor, true); + m_editorRenderer.RenderActorOutlinePass(selectedActor, true, true); baseRenderer.ApplyStateMask(p_defaultRenderState); - m_editorRenderer.RenderActorAsSelected(selectedActor, false); + m_editorRenderer.RenderActorOutlinePass(selectedActor, false, true); } baseRenderer.ApplyStateMask(p_defaultRenderState); baseRenderer.Clear(false, true, false); - m_editorRenderer.RenderGizmo(selectedActor.transform.GetWorldPosition(), selectedActor.transform.GetWorldRotation(), m_currentOperation); + + int highlightedAxis = -1; + + if (m_highlightedGizmoDirection.has_value()) + { + highlightedAxis = static_cast(m_highlightedGizmoDirection.value()); + } + + m_editorRenderer.RenderGizmo(selectedActor.transform.GetWorldPosition(), selectedActor.transform.GetWorldRotation(), m_currentOperation, false, highlightedAxis); + } + + if (m_highlightedActor.has_value()) + { + m_editorRenderer.RenderActorOutlinePass(m_highlightedActor.value().get(), true, false); + baseRenderer.ApplyStateMask(p_defaultRenderState); + m_editorRenderer.RenderActorOutlinePass(m_highlightedActor.value().get(), false, false); } m_fbo.Unbind(); @@ -178,7 +192,7 @@ void OvEditor::Panels::SceneView::HandleActorPicking() m_gizmoOperations.StopPicking(); } - if (IsHovered() && !IsResizing() && inputManager.IsMouseButtonPressed(EMouseButton::MOUSE_BUTTON_LEFT) && !m_cameraController.IsRightMousePressed()) + if (IsHovered() && !IsResizing()) { RenderSceneForActorPicking(); @@ -193,24 +207,46 @@ void OvEditor::Panels::SceneView::HandleActorPicking() glReadPixels(static_cast(mouseX), static_cast(mouseY), 1, 1, GL_RGB, GL_UNSIGNED_BYTE, pixel); m_actorPickingFramebuffer.Unbind(); - /* Gizmo picking */ - if (EDITOR_EXEC(IsAnyActorSelected()) && pixel[0] == 255 && pixel[1] == 255 && pixel[2] >= 252 && pixel[2] <= 254) + uint32_t actorID = (0 << 24) | (pixel[2] << 16) | (pixel[1] << 8) | (pixel[0] << 0); + auto actorUnderMouse = EDITOR_CONTEXT(sceneManager).GetCurrentScene()->FindActorByID(actorID); + auto direction = m_gizmoOperations.IsPicking() ? m_gizmoOperations.GetDirection() : EDITOR_EXEC(IsAnyActorSelected()) && pixel[0] == 255 && pixel[1] == 255 && pixel[2] >= 252 && pixel[2] <= 254 ? static_cast(pixel[2] - 252) : std::optional{}; + + m_highlightedActor = {}; + m_highlightedGizmoDirection = {}; + + if (!m_cameraController.IsRightMousePressed()) { - auto direction = static_cast(pixel[2] - 252); - m_gizmoOperations.StartPicking(EDITOR_EXEC(GetSelectedActor()), m_cameraPosition, m_currentOperation, direction); + if (direction.has_value()) + { + m_highlightedGizmoDirection = direction; + + } + else if (actorUnderMouse != nullptr) + { + m_highlightedActor = std::ref(*actorUnderMouse); + } } - /* Actor picking */ - else - { - uint32_t actorID = (0 << 24) | (pixel[2] << 16) | (pixel[1] << 8) | (pixel[0] << 0); - if (auto actor = EDITOR_CONTEXT(sceneManager).GetCurrentScene()->FindActorByID(actorID)) + /* Click */ + if (inputManager.IsMouseButtonPressed(EMouseButton::MOUSE_BUTTON_LEFT) && !m_cameraController.IsRightMousePressed()) + { + /* Gizmo picking */ + if (direction.has_value()) { - EDITOR_EXEC(SelectActor(*actor)); + m_gizmoOperations.StartPicking(EDITOR_EXEC(GetSelectedActor()), m_cameraPosition, m_currentOperation, direction.value()); } + /* Actor picking */ else { - EDITOR_EXEC(UnselectActor()); + + if (actorUnderMouse) + { + EDITOR_EXEC(SelectActor(*actorUnderMouse)); + } + else + { + EDITOR_EXEC(UnselectActor()); + } } } } diff --git a/Sources/Overload/OvEditor/src/OvEditor/Resources/RawShaders.cpp b/Sources/Overload/OvEditor/src/OvEditor/Resources/RawShaders.cpp index c6df3e78..58b6aa20 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Resources/RawShaders.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Resources/RawShaders.cpp @@ -142,6 +142,7 @@ out VS_OUT uniform bool u_IsBall; uniform bool u_IsPickable; +uniform int u_HighlightedAxis; mat4 rotationMatrix(vec3 axis, float angle) { @@ -201,7 +202,14 @@ void main() float green = float(gl_InstanceID == 2); // Y float blue = float(gl_InstanceID == 0); // Z - vs_out.Color = vec3(red, green, blue); + if (!u_IsPickable && ((gl_InstanceID == 1 && u_HighlightedAxis == 0) || (gl_InstanceID == 2 && u_HighlightedAxis == 1) || (gl_InstanceID == 0 && u_HighlightedAxis == 2))) + { + vs_out.Color = vec3(1.0f, 1.0f, 0.0f); + } + else + { + vs_out.Color = vec3(red, green, blue); + } } } From edb21e4789e68a563e3eadf39bab734bc9c7ecec Mon Sep 17 00:00:00 2001 From: Kubisek Date: Fri, 6 Mar 2020 17:07:33 +0100 Subject: [PATCH 11/46] Enable vsync in editor by default. --- Sources/Overload/OvEditor/src/OvEditor/Core/Application.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/Overload/OvEditor/src/OvEditor/Core/Application.cpp b/Sources/Overload/OvEditor/src/OvEditor/Core/Application.cpp index f6a62fda..119cd635 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Core/Application.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Core/Application.cpp @@ -12,7 +12,7 @@ OvEditor::Core::Application::Application(const std::string& p_projectPath, const m_context(p_projectPath, p_projectName), m_editor(m_context) { - + m_context.device->SetVsync(true); } OvEditor::Core::Application::~Application() From 829d09b546c1e955854730065f2649a9e230f2d8 Mon Sep 17 00:00:00 2001 From: Kubisek Date: Fri, 6 Mar 2020 21:29:38 +0100 Subject: [PATCH 12/46] Moved device->SetVsync(true) to OvEditor::Core::Context::Context for consistency with OvGame. --- Sources/Overload/OvEditor/src/OvEditor/Core/Application.cpp | 1 - Sources/Overload/OvEditor/src/OvEditor/Core/Context.cpp | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Sources/Overload/OvEditor/src/OvEditor/Core/Application.cpp b/Sources/Overload/OvEditor/src/OvEditor/Core/Application.cpp index 119cd635..48756ceb 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Core/Application.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Core/Application.cpp @@ -12,7 +12,6 @@ OvEditor::Core::Application::Application(const std::string& p_projectPath, const m_context(p_projectPath, p_projectName), m_editor(m_context) { - m_context.device->SetVsync(true); } OvEditor::Core::Application::~Application() diff --git a/Sources/Overload/OvEditor/src/OvEditor/Core/Context.cpp b/Sources/Overload/OvEditor/src/OvEditor/Core/Context.cpp index 37635584..dbac8bbc 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Core/Context.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Core/Context.cpp @@ -54,6 +54,8 @@ OvEditor::Core::Context::Context(const std::string& p_projectPath, const std::st inputManager = std::make_unique(*window); window->MakeCurrentContext(); + device->SetVsync(true); + /* Graphics context creation */ driver = std::make_unique(OvRendering::Settings::DriverSettings{ true }); renderer = std::make_unique(*driver); From ec417cdd4be86035ff01d8c109ee04393326e175 Mon Sep 17 00:00:00 2001 From: Adrien GIVRY Date: Fri, 6 Mar 2020 20:47:27 -0500 Subject: [PATCH 13/46] Adding and updating community documents Some documents has been added: - Code of conduct - Contribution guidelines - Bug report template - Feature request template And others has been updated: - README --- .github/ISSUE_TEMPLATE/bug_report.md | 24 ++++ .github/ISSUE_TEMPLATE/feature_request.md | 14 +++ CODE_OF_CONDUCT.md | 76 ++++++++++++ CONTRIBUTING.md | 41 +++++++ README.md | 135 +++++++++++++--------- 5 files changed, 234 insertions(+), 56 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md create mode 100644 CODE_OF_CONDUCT.md create mode 100644 CONTRIBUTING.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 00000000..5b4c58ea --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,24 @@ +--- +name: Bug report +about: Create a report to help us improve +title: '' +labels: Bug +assignees: '' + +--- + +**Description** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 00000000..a186b877 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,14 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: '' +labels: Feature +assignees: '' + +--- + +**Problem this feature should fix** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Expected solution** +A clear and concise description of what you want to happen. diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 00000000..4a7431b7 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,76 @@ +# Contributor Covenant Code of Conduct + +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge to making participation in our project and +our community a harassment-free experience for everyone, regardless of age, body +size, disability, ethnicity, sex characteristics, gender identity and expression, +level of experience, education, socio-economic status, nationality, personal +appearance, race, religion, or sexual identity and orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment +include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or + advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic + address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable +behavior and are expected to take appropriate and fair corrective action in +response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or +reject comments, commits, code, wiki edits, issues, and other contributions +that are not aligned to this Code of Conduct, or to ban temporarily or +permanently any contributor for other behaviors that they deem inappropriate, +threatening, offensive, or harmful. + +## Scope + +This Code of Conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. Examples of +representing a project or community include using an official project e-mail +address, posting via an official social media account, or acting as an appointed +representative at an online or offline event. Representation of a project may be +further defined and clarified by project maintainers. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported by contacting the project team at adrien@givry.pro. All +complaints will be reviewed and investigated and will result in a response that +is deemed necessary and appropriate to the circumstances. The project team is +obligated to maintain confidentiality with regard to the reporter of an incident. +Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good +faith may face temporary or permanent repercussions as determined by other +members of the project's leadership. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, +available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html + +[homepage]: https://www.contributor-covenant.org + +For answers to common questions about this code of conduct, see +https://www.contributor-covenant.org/faq diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 00000000..d3f83975 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,41 @@ +# Contributing to Overload +First of all, thanks for your interest into Overload! Any contribution is welcome: + +- Reporting a bug +- Submitting a fix +- Proposing new features +- Improving the code quality + +## We Develop with Github +We use github to host code, to track issues and feature requests, as well as accept pull requests. + +## We Use [Github Flow](https://guides.github.com/introduction/flow/index.html), So All Code Changes Happen Through Pull Requests +Pull requests are the best way to propose changes to the codebase (we use [Github Flow](https://guides.github.com/introduction/flow/index.html)). We actively welcome your pull requests: + +1. Fork the repo +2. Create your branch from `develop` respecting naming conventions +3. Review your code before submitting (Build and quality check) +4. Create a pull request to `develop` + +## Any contributions you make will be under the MIT Software License +In short, when you submit code changes, your submissions are understood to be under the same [MIT License](http://choosealicense.com/licenses/mit/) that covers the project. Feel free to contact the maintainers if that's a concern. + +## Report bugs using Github's issues +We use GitHub issues to track public bugs. Report a bug by opening a new issue it's that easy! + +## Use a Consistent Coding Style +* Interfaces starts by `I` +* Abstracts starts by `A` +* Class names: `UpperCamelCase` +* Public member variables: `lowerCamelCase` +* Private member variables: `m_lowerCamelCase` +* Public static variables: `UpperCamelCase` +* Private static variables: `_CAPS_LOCK_WITH_UNDERSCORES` +* Function/Method arguments: `p_lowerCamelCase` +* Function/Method names: `UpperCamelCase` +* Class member variables are located on file bottom +* Comment your functions, enums, classes, methods ([Javadoc style](https://en.wikipedia.org/wiki/Javadoc)) +Some coding convention could have been forget while redacting this document, so always refer to the existing code base! + +## Thanks! +Thanks for being part of the Overload Tech. team! diff --git a/README.md b/README.md index 1d7c5dfd..274ca880 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,43 @@ ![Overload Logo](Showcase/logo.png) -## Context -Overload is a graduation project. We were 3 ([Benjamin VIRANIN](https://github.com/BenjaminViranin), [Max BRUN](https://github.com/maxbrundev) and me) working on during 5 months. -We had to create a game engine from scratch, using the fewest libraries possible. +# 1. What is Overload +## 1.1. Description +Overload is an alternative game engine, inspired by industry standards, initiated by [Benjamin VIRANIN](https://github.com/BenjaminViranin), [Max BRUN](https://github.com/maxbrundev) and [Adrien GIVRY](https://github.com/adriengivry). Overload is now a community project, opened to any contribution. + +Overload pillars are: +- Simplicity +- Documentation +- High-quality modern C++ code + +## 1.2. Modules +Overload is divided into 12 modules (10 DLLs and 2 executables): + +### 1.2.1. Overload SDK +The Overload SDK is the core of the engine. It is a set of libraries that our applications (`OvGame` and `OvEditor`) are using. +We designed theses libraries with reusability in mind. They are extremely modular and easy to extract from a game engine context. +- `OvAnalytics`: Code and hardware profiling +- `OvDebug`: Logging, assertions +- `OvTools`: Serialization, ini files, events, time +- `OvMaths`: Vectors, Matrices, Quaternion, Transform +- `OvAudio`: Wraps irrKlang +- `OvPhysics`: Wraps Bullet3 +- `OvRendering`: Rendering engine using OpenGL +- `OvWindowing`: GLFW + Windows API wrapper +- `OvUI`: Dear imGui wrapped into an event-based and component-based UI system +- `OvCore`: Mediator, resource management, scripting, component-based scene system + +### 1.2.2. Overload Applications +- `OvGame`: Uses OvCore, asset dependent, generic executable for any game built with Overload +- `OvEditor`: Uses OvCore, expose game development to the end-user (From creation to building) ![Editor](Showcase/Masthead.jpg) +*Preview of Overload Game Editor for its first release (v.1.0.0)* -## Team goals +# 2. History of Overload +## 2.1. Context +Initially, Overload was a graduation project. We were 3 ([Benjamin VIRANIN](https://github.com/BenjaminViranin), [Max BRUN](https://github.com/maxbrundev) and [Adrien GIVRY](https://github.com/adriengivry)) working on it for 5 months. We had to create a game engine from scratch, using the fewest libraries possible. + +## 2.2. Goals Our goals for this project were: - Understanding how to architect a game engine - Designing an application thinking of end-users @@ -16,10 +47,40 @@ Our goals for this project were: - Dealing with a long-term project - Developping documentation for developers and end-users -## Software used -- Visual Studio 2017 and 2019 to code +## 2.3. Pre-production +We spent about a month designing our initial architecture. We tried to provide a technical solution with UML diagrams, flowcharts, package diagrams and use-case diagrams. This was a long and tedious work, but it really helped us to start the production with a clear vision of the engine. We defined some coding convention to ensure that all of our work will stay homogeneous during the production. Defining these kinds of rules is crucial to keep a maintainable code during the whole project. -## Libraries used +## 2.4. Production +The production made us realize that we had a naive idea of what a game engine is. During this phase our architecture has evolved. We found that our initial architecture was sometimes too complex, non-optimal. We went back to architecture design multiple times during the project. + +# 3. Features +## 3.1. Implemented +Here is a non-exhaustive list of Overload main features: +- Game Editor +- Lua scripting +- Physically-based rendering (PBR) +- Custom shaders support +- Windows game building +- Profiling tools (Editor and build) +- Material editor +- 3D sound system +- Rigidbody physics + +## 3.2. To implement +Again, a non-exhaustive list of Overload in-coming features: +- Shadow mapping +- Custom post-processing +- Renderer Hardware Interface (Multiple graphics backend support) +- More input device support (Gamepad) +- Prefab system +- Skeletal animation +- User scripts profiling + +# 4. Details +## 4.1. Software +- Visual Studio 2019 + +## 4.2. Dependencies - OpenGL with GLEW (Graphics API) - GLFW (Windowing and inputs) - Assimp (3D model loader) @@ -29,62 +90,24 @@ Our goals for this project were: - SOL2 (Lua binder) - imGui (GUI) -## Pre-production -We spent about a month designing our initial architecture. We tried to provide a technical solution with UML diagrams, flowcharts, package diagrams and use-case diagrams. This was a long and tedious work, but it really helped us to start the production with a clear vision of the engine. We defined some coding convention to ensure that all of our work will stay homogeneous during the production. Defining these kinds of rules is crucial to keep a maintainable code during the whole project. +## 4.3. Compiling sources +We made this project using Visual Studio 2019. If you want to compile Overload, you should consider using this IDE.
+Overload only targets Windows x64. -## Production -The production made us realize that we had a naive idea of what a game engine is. During this phase our architecture has evolved. We found that our initial architecture was sometimes too complex, non-optimal. We went back to architecture design multiple times during the project. +## 4.4. Licence +Overload is licenced under an MIT licence. -## Modules -Our final solution is divided into 12 modules: -- OvAnalytics: Code and hardware profiling -- OvDebug: Logging, assertions -- OvTools: Serialization, ini files, events, time -- OvMaths: Vectors, Matrices, Quaternion, Transform -- OvAudio: Wraps irrKlang -- OvPhysics: Wraps Bullet3 -- OvRendering: Rendering engine using OpenGL -- OvWindowing: GLFW + Windows API wrapper -- OvUI: imGui wrapped into an event-based and component-based UI system -- OvCore: Mediator, resource management, scripting, component-based scene system -- OvGame: Uses OvCore, asset dependent, generic executable for any game built with Overload -- OvEditor: Uses OvCore, expose game development to the end-user (From creation to build) - -## Team organization -At the beginning of the project we decided to split the main tasks like this: -- Rendering: [Max BRUN](https://github.com/maxbrundev) -- Physics and audio: [Benjamin VIRANIN](https://github.com/BenjaminViranin) -- Core and editor: Me - -But the more the project progressed, the more we moved. We all worked on every parts of the engine, and it was a good way to expand our areas of expertise. Finally, although I focused more on the core and the editor, I helped my teammates on their modules. - -## Features -We end-up this project with much more features than we expected. We used an iterative strategy, meaning that we developped our modules as simple as possible in order to quickly have results. We then iterated over and over to add new features. - -## Game -We made a game with our engine to demonstrate its capabilities. Our game has a complete game loop (Menu, story, cinematic, game, credits). - -## Build information -We made this project using Visual Studio 2017. If you want to build Overload you should consider using this IDE.
-Overload only supports Windows x64. - -## Licence -This software may not be resold, redistributed or otherwise conveyed to a third party. - -## More information +## 4.5. More information If you are interested in Overload, you can download our engine and the demo game we made with it on our website:
-http://overloadengine.org

+http://overloadengine.org + You can also watch our features reel on YouTube:
-https://www.youtube.com/watch?v=ARXSJh-ZMHM

+https://www.youtube.com/watch?v=ARXSJh-ZMHM + And join our Discord Server:
https://discord.gg/wqe775s
-## Credits -- [Adrien GIVRY](https://github.com/adriengivry) -- [Max BRUN](https://github.com/maxbrundev) -- [Benjamin VIRANIN](https://github.com/BenjaminViranin) - -## Images +# 5. Screenshots ![Advanced lighting](Showcase/Advanced_Lighting.jpg) ![Standard shaders](Showcase/Standard_Shaders.jpg) ![User shaders support](Showcase/Custom_Shaders.jpg) From ea9128c7bd5f95d5fc2b0d4ba05aacd2e09808af Mon Sep 17 00:00:00 2001 From: Adrien GIVRY Date: Sat, 7 Mar 2020 00:30:48 -0500 Subject: [PATCH 14/46] Update README.md --- README.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/README.md b/README.md index 274ca880..698b04e0 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,23 @@ ![Overload Logo](Showcase/logo.png) +

+ Releases | + Screenshots | + Features +
+
+platforms +release +size +
+issues +pulls +
+license +downloads +
+

+ # 1. What is Overload ## 1.1. Description Overload is an alternative game engine, inspired by industry standards, initiated by [Benjamin VIRANIN](https://github.com/BenjaminViranin), [Max BRUN](https://github.com/maxbrundev) and [Adrien GIVRY](https://github.com/adriengivry). Overload is now a community project, opened to any contribution. @@ -53,6 +71,7 @@ We spent about a month designing our initial architecture. We tried to provide a ## 2.4. Production The production made us realize that we had a naive idea of what a game engine is. During this phase our architecture has evolved. We found that our initial architecture was sometimes too complex, non-optimal. We went back to architecture design multiple times during the project. + # 3. Features ## 3.1. Implemented Here is a non-exhaustive list of Overload main features: @@ -107,6 +126,7 @@ https://www.youtube.com/watch?v=ARXSJh-ZMHM And join our Discord Server:
https://discord.gg/wqe775s
+ # 5. Screenshots ![Advanced lighting](Showcase/Advanced_Lighting.jpg) ![Standard shaders](Showcase/Standard_Shaders.jpg) From bddf6d1a970beccee98e5ac0d93a77f90aa61ef4 Mon Sep 17 00:00:00 2001 From: Adrien GIVRY Date: Sat, 7 Mar 2020 18:22:56 -0500 Subject: [PATCH 15/46] Remove camera yaw pitch roll log While working on the orbit camera, I was using an OVLOG to debug my code. However I forgot to remove it from my pull request... So here is a very small fix addressing this problem. --- Sources/Overload/OvEditor/src/OvEditor/Core/CameraController.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Sources/Overload/OvEditor/src/OvEditor/Core/CameraController.cpp b/Sources/Overload/OvEditor/src/OvEditor/Core/CameraController.cpp index 82c1cf19..b69ed835 100644 --- a/Sources/Overload/OvEditor/src/OvEditor/Core/CameraController.cpp +++ b/Sources/Overload/OvEditor/src/OvEditor/Core/CameraController.cpp @@ -322,7 +322,6 @@ void OvEditor::Core::CameraController::HandleCameraFPSMouse(const OvMaths::FVect { m_ypr = OvMaths::FQuaternion::EulerAngles(m_cameraRotation); m_ypr = RemoveRoll(m_ypr); - OVLOG("X:" + std::to_string(m_ypr.x) + " Y:" + std::to_string(m_ypr.y) + " Z:" + std::to_string(m_ypr.z)); } m_ypr.y -= mouseOffset.x; From 8f1c05ad8d62b08ce0840223a322f6637a5898ce Mon Sep 17 00:00:00 2001 From: Adrien GIVRY Date: Wed, 6 May 2020 16:26:39 -0400 Subject: [PATCH 16/46] Updating Sol2 version and fixing bigobj issue The Sol2 version has been updated. The previous version had trouble compiling with Visual Studio 16.5.2 (MSVC v142). A compilation failure due to a missing /bigobj compilation option has also been fixed. --- Dependencies/lua/include/sol.hpp | 44183 ++++++++++++----------- Sources/Overload/OvCore/OvCore.vcxproj | 12 +- 2 files changed, 23929 insertions(+), 20266 deletions(-) diff --git a/Dependencies/lua/include/sol.hpp b/Dependencies/lua/include/sol.hpp index dd1e0447..b78ee8c3 100644 --- a/Dependencies/lua/include/sol.hpp +++ b/Dependencies/lua/include/sol.hpp @@ -1,6 +1,6 @@ // The MIT License (MIT) -// Copyright (c) 2013-2018 Rapptz, ThePhD and contributors +// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors // Permission is hereby granted, free of charge, to any person obtaining a copy of // this software and associated documentation files (the "Software"), to deal in @@ -20,27 +20,24 @@ // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // This file was generated with a script. -// Generated 2019-01-26 08:24:35.370911 UTC -// This header was generated with sol v2.20.6 (revision e63f840) +// Generated 2020-03-31 04:18:51.740568 UTC +// This header was generated with sol v3.2.0 (revision 82812c5) // https://github.com/ThePhD/sol2 #ifndef SOL_SINGLE_INCLUDE_HPP #define SOL_SINGLE_INCLUDE_HPP -// beginning of sol.hpp +// beginning of sol/sol.hpp #ifndef SOL_HPP #define SOL_HPP #if defined(UE_BUILD_DEBUG) || defined(UE_BUILD_DEVELOPMENT) || defined(UE_BUILD_TEST) || defined(UE_BUILD_SHIPPING) || defined(UE_SERVER) -#define SOL_INSIDE_UNREAL 1 -#endif // Unreal Engine 4 bullshit - -#if defined(SOL_INSIDE_UNREAL) && SOL_INSIDE_UNREAL +#define SOL_INSIDE_UNREAL #ifdef check -#define SOL_INSIDE_UNREAL_REMOVED_CHECK 1 +#pragma push_macro("check") #undef check -#endif +#endif #endif // Unreal Engine 4 Bullshit #if defined(__GNUC__) @@ -52,25 +49,21 @@ #endif #elif defined(__clang__) #elif defined _MSC_VER -#pragma warning( push ) -#pragma warning( disable : 4324 ) // structure was padded due to alignment specifier -#pragma warning( disable : 4503 ) // decorated name horse shit -#pragma warning( disable : 4702 ) // unreachable code -#pragma warning( disable: 4127 ) // 'conditional expression is constant' yeah that's the point your old compilers don't have `if constexpr` you jerk -#pragma warning( disable: 4505 ) // some other nonsense warning -#endif // clang++ vs. g++ vs. VC++ +#pragma warning(push) +#pragma warning(disable : 4505) // unreferenced local function has been removed GEE THANKS +#endif // clang++ vs. g++ vs. VC++ // beginning of sol/forward.hpp +#ifndef SOL_FORWARD_HPP +#define SOL_FORWARD_HPP + // beginning of sol/feature_test.hpp -#if (defined(__cplusplus) && __cplusplus == 201703L) || (defined(_MSC_VER) && _MSC_VER > 1900 && ((defined(_HAS_CXX17) && _HAS_CXX17 == 1) || (defined(_MSVC_LANG) && (_MSVC_LANG > 201402L)))) -#ifndef SOL_CXX17_FEATURES -#define SOL_CXX17_FEATURES 1 -#endif // C++17 features macro +#if (defined(__cplusplus) && __cplusplus >= 201703L) \ + || (defined(_MSC_VER) && _MSC_VER > 1900 && ((defined(_HAS_CXX17) && _HAS_CXX17 == 1) || (defined(_MSVC_LANG) && (_MSVC_LANG > 201402L)))) #endif // C++17 features check -#if defined(SOL_CXX17_FEATURES) && SOL_CXX17_FEATURES #if defined(__cpp_noexcept_function_type) || ((defined(_MSC_VER) && _MSC_VER > 1911) && (defined(_MSVC_LANG) && ((_MSVC_LANG >= 201403L)))) #ifndef SOL_NOEXCEPT_FUNCTION_TYPE #define SOL_NOEXCEPT_FUNCTION_TYPE 1 @@ -85,142 +78,116 @@ #else #define SOL_STD_VARIANT 1 #endif // Clang screws up variant -#endif // C++17 only // beginning of sol/config.hpp #ifdef _MSC_VER - #if defined(_DEBUG) && !defined(NDEBUG) +#if defined(_DEBUG) && !defined(NDEBUG) +#ifndef SOL_IN_DEBUG_DETECTED +#define SOL_IN_DEBUG_DETECTED 1 +#endif +#endif // VC++ Debug macros - #ifndef SOL_IN_DEBUG_DETECTED - #define SOL_IN_DEBUG_DETECTED 1 - #endif +#if !defined(_CPPUNWIND) +#if !defined(SOL_NO_EXCEPTIONS) +#define SOL_NO_EXCEPTIONS 1 +#endif +#endif // Automatic Exceptions - #endif // VC++ Debug macros +#if !defined(_CPPRTTI) +#if !defined(SOL_NO_RTTI) +#define SOL_NO_RTTI 1 +#endif +#endif // Automatic RTTI +#elif defined(__GNUC__) || defined(__clang__) - #ifndef _CPPUNWIND - #ifndef SOL_NO_EXCEPTIONS - #define SOL_NO_EXCEPTIONS 1 - #endif - #endif // Automatic Exceptions +#if !defined(NDEBUG) && !defined(__OPTIMIZE__) +#if !defined(SOL_IN_DEBUG_DETECTED) +#define SOL_IN_DEBUG_DETECTED 1 +#endif +#endif // Not Debug && g++ optimizer flag - #ifndef _CPPRTTI - #ifndef SOL_NO_RTTI - #define SOL_NO_RTTI 1 - #endif - #endif // Automatic RTTI -#elif defined(__GNUC__) || defined(__clang__) +#if !defined(__EXCEPTIONS) +#if !defined(SOL_NO_EXCEPTIONS) +#define SOL_NO_EXCEPTIONS 1 +#endif +#endif // No Exceptions - #if !defined(NDEBUG) && !defined(__OPTIMIZE__) +#if !defined(__GXX_RTTI) +#if !defined(SOL_NO_RTTI) +#define SOL_NO_RTTI 1 +#endif +#endif // No RTTI - #ifndef SOL_IN_DEBUG_DETECTED - #define SOL_IN_DEBUG_DETECTED 1 - #endif +#endif // vc++ || clang++/g++ - #endif // Not Debug && g++ optimizer flag +#if defined(SOL_CHECK_ARGUMENTS) && SOL_CHECK_ARGUMENTS != 0 +#if defined(SOL_ALL_SAFETIES_ON) +#define SOL_ALL_SAFETIES_ON 1 +#endif // turn all the safeties on +#endif // Compatibility Define for Safety - #ifndef __EXCEPTIONS - #ifndef SOL_NO_EXCEPTIONS - #define SOL_NO_EXCEPTIONS 1 - #endif - #endif // No Exceptions +#if defined(SOL_ALL_SAFETIES_ON) && SOL_ALL_SAFETIES_ON != 0 - #ifndef __GXX_RTTI - #ifndef SOL_NO_RTII - #define SOL_NO_RTTI 1 - #endif - #endif // No RTTI +#if !defined(SOL_SAFE_GETTER) +#define SOL_SAFE_GETTER 1 +#endif -#endif // vc++ || clang++/g++ +#if !defined(SOL_SAFE_USERTYPE) +#define SOL_SAFE_USERTYPE 1 +#endif + +#if !defined(SOL_SAFE_REFERENCES) +#define SOL_SAFE_REFERENCES 1 +#endif + +#if !defined(SOL_SAFE_FUNCTION) +#define SOL_SAFE_FUNCTION 1 +#endif + +#if !defined(SOL_SAFE_FUNCTION_CALLS) +#define SOL_SAFE_FUNCTION_CALLS 1 +#endif + +#if !defined(SOL_SAFE_PROXIES) +#define SOL_SAFE_PROXIES 1 +#endif + +#if !defined(SOL_SAFE_NUMERICS) +#define SOL_SAFE_NUMERICS 1 +#endif + +#if !defined(SOL_NO_CHECK_NUMBER_PRECISION) +#define SOL_NO_CHECK_NUMBER_PRECISION 0 +#endif -#if defined(SOL_CHECK_ARGUMENTS) && SOL_CHECK_ARGUMENTS - - // Checks low-level getter function - // (and thusly, affects nearly entire framework) - #if !defined(SOL_SAFE_GETTER) - #define SOL_SAFE_GETTER 1 - #endif - - // Checks access on usertype functions - // local my_obj = my_type.new() - // my_obj.my_member_function() - // -- bad syntax and crash - #if !defined(SOL_SAFE_USERTYPE) - #define SOL_SAFE_USERTYPE 1 - #endif - - // Checks sol::reference derived boundaries - // sol::function ref(L, 1); - // sol::userdata sref(L, 2); - #if !defined(SOL_SAFE_REFERENCES) - #define SOL_SAFE_REFERENCES 1 - #endif - - // Changes all typedefs of sol::function to point to the - // protected_function version, instead of unsafe_function - #if !defined(SOL_SAFE_FUNCTION) - #define SOL_SAFE_FUNCTION 1 - #endif - - // Checks function parameters and - // returns upon call into/from Lua - // local a = 1 - // local b = "woof" - // my_c_function(a, b) - #if !defined(SOL_SAFE_FUNCTION_CALLS) - #define SOL_SAFE_FUNCTION_CALLS 1 - #endif - - // Checks conversions - // int v = lua["bark"]; - // int v2 = my_sol_function(); - #if !defined(SOL_SAFE_PROXIES) - #define SOL_SAFE_PROXIES 1 - #endif - - // Check overflowing number conversions - // for things like 64 bit integers that don't fit in a typical lua_Number - // for Lua 5.1 and 5.2 - #if !defined(SOL_SAFE_NUMERICS) - #define SOL_SAFE_NUMERICS 1 - #endif - - // Turn off Number Precision Checks - // if this is defined, we do not do range - // checks on integers / unsigned integers that might - // be bigger than what Lua can represent - #if !defined(SOL_NO_CHECK_NUMBER_PRECISION) - // off by default - #define SOL_NO_CHECK_NUMBER_PRECISION 0 - #endif +#if !defined(SOL_SAFE_STACK_CHECK) +#define SOL_SAFE_STACK_CHECK 1 +#endif #endif // Turn on Safety for all if top-level macro is defined -#if defined(SOL_IN_DEBUG_DETECTED) && SOL_IN_DEBUG_DETECTED +#if defined(SOL_IN_DEBUG_DETECTED) && SOL_IN_DEBUG_DETECTED != 0 + +#if !defined(SOL_SAFE_REFERENCES) +#define SOL_SAFE_REFERENCES 1 +#endif - #if !defined(SOL_SAFE_REFERENCES) - // Ensure that references are forcefully type-checked upon construction - #define SOL_SAFE_REFERENCES 1 - #endif +#if !defined(SOL_SAFE_USERTYPE) +#define SOL_SAFE_USERTYPE 1 +#endif - // Safe usertypes checks for errors such as - // obj = my_type.new() - // obj.f() -- note the '.' instead of ':' - // usertypes should be safe no matter what - #if !defined(SOL_SAFE_USERTYPE) - #define SOL_SAFE_USERTYPE 1 - #endif +#if !defined(SOL_SAFE_FUNCTION_CALLS) +#define SOL_SAFE_FUNCTION_CALLS 1 +#endif - #if !defined(SOL_SAFE_FUNCTION_CALLS) - // Function calls from Lua should be automatically safe in debug mode - #define SOL_SAFE_FUNCTION_CALLS 1 - #endif +#if !defined(SOL_PRINT_ERRORS) +#define SOL_PRINT_ERRORS 1 +#endif - // Print any exceptions / errors that occur - // in debug mode to the default error stream / console - #if !defined(SOL_PRINT_ERRORS) - #define SOL_PRINT_ERRORS 1 - #endif +#if !defined(SOL_SAFE_STACK_CHECK) +#define SOL_SAFE_STACK_CHECK 1 +#endif #endif // DEBUG: Turn on all debug safety features for VC++ / g++ / clang++ and similar @@ -242,16 +209,14 @@ #endif #endif // avoiding nil defines / keywords -#if defined(SOL_USE_BOOST) && SOL_USE_BOOST -#ifndef SOL_UNORDERED_MAP_COMPATIBLE_HASH -#define SOL_UNORDERED_MAP_COMPATIBLE_HASH 1 -#endif // SOL_UNORDERED_MAP_COMPATIBLE_HASH -#endif - #ifndef SOL_STACK_STRING_OPTIMIZATION_SIZE #define SOL_STACK_STRING_OPTIMIZATION_SIZE 1024 #endif // Optimized conversion routines using a KB or so off the stack +#if !defined(SOL_SAFE_STACK_CHECK) +#define SOL_SAFE_STACK_CHECK 0 +#endif // use luaL_checkstack to check stack overflow / overrun + // end of sol/config.hpp // beginning of sol/config_setup.hpp @@ -260,264 +225,394 @@ // end of sol/feature_test.hpp +#include +#include +#include + +#if defined(SOL_USING_CXX_LUA) && SOL_USING_CXX_LUA +struct lua_State; +#else +extern "C" { + struct lua_State; +} +#endif // C++ Mangling for Lua vs. Not + namespace sol { - template - class basic_reference; - using reference = basic_reference; - using main_reference = basic_reference; - class stack_reference; - - struct proxy_base_tag; - template - struct proxy_base; - template - struct proxy; - - template - class usertype; - template - class simple_usertype; - template - class basic_table_core; - template - using table_core = basic_table_core; - template - using main_table_core = basic_table_core; - template - using stack_table_core = basic_table_core; - template - using basic_table = basic_table_core; - typedef table_core table; - typedef table_core global_table; - typedef main_table_core main_table; - typedef main_table_core main_global_table; - typedef stack_table_core stack_table; - typedef stack_table_core stack_global_table; - template - struct basic_environment; - using environment = basic_environment; - using main_environment = basic_environment; - using stack_environment = basic_environment; - template - class basic_function; - template - class basic_protected_function; - using unsafe_function = basic_function; - using safe_function = basic_protected_function; - using main_unsafe_function = basic_function; - using main_safe_function = basic_protected_function; - using stack_unsafe_function = basic_function; - using stack_safe_function = basic_protected_function; - using stack_aligned_unsafe_function = basic_function; - using stack_aligned_safe_function = basic_protected_function; - using protected_function = safe_function; - using main_protected_function = main_safe_function; - using stack_protected_function = stack_safe_function; - using stack_aligned_protected_function = stack_aligned_safe_function; + enum class type; + + class stateless_reference; + template + class basic_reference; + using reference = basic_reference; + using main_reference = basic_reference; + class stateless_stack_reference; + class stack_reference; + + template + class basic_bytecode; + + struct lua_value; + + struct proxy_base_tag; + template + struct proxy_base; + template + struct table_proxy; + + template + class basic_table_core; + template + using table_core = basic_table_core; + template + using main_table_core = basic_table_core; + template + using stack_table_core = basic_table_core; + template + using basic_table = basic_table_core; + using table = table_core; + using global_table = table_core; + using main_table = main_table_core; + using main_global_table = main_table_core; + using stack_table = stack_table_core; + using stack_global_table = stack_table_core; + + template + struct basic_lua_table; + using lua_table = basic_lua_table; + using stack_lua_table = basic_lua_table; + + template + class basic_usertype; + template + using usertype = basic_usertype; + template + using stack_usertype = basic_usertype; + + template + class basic_metatable; + using metatable = basic_metatable; + using stack_metatable = basic_metatable; + + template + struct basic_environment; + using environment = basic_environment; + using main_environment = basic_environment; + using stack_environment = basic_environment; + + template + class basic_function; + template + class basic_protected_function; + using unsafe_function = basic_function; + using safe_function = basic_protected_function; + using main_unsafe_function = basic_function; + using main_safe_function = basic_protected_function; + using stack_unsafe_function = basic_function; + using stack_safe_function = basic_protected_function; + using stack_aligned_unsafe_function = basic_function; + using stack_aligned_safe_function = basic_protected_function; + using protected_function = safe_function; + using main_protected_function = main_safe_function; + using stack_protected_function = stack_safe_function; + using stack_aligned_protected_function = stack_aligned_safe_function; #if defined(SOL_SAFE_FUNCTION) && SOL_SAFE_FUNCTION - using function = protected_function; - using main_function = main_protected_function; - using stack_function = stack_protected_function; + using function = protected_function; + using main_function = main_protected_function; + using stack_function = stack_protected_function; + using stack_aligned_function = stack_aligned_safe_function; #else - using function = unsafe_function; - using main_function = main_unsafe_function; - using stack_function = stack_unsafe_function; + using function = unsafe_function; + using main_function = main_unsafe_function; + using stack_function = stack_unsafe_function; + using stack_aligned_function = stack_aligned_unsafe_function; #endif - using stack_aligned_function = stack_aligned_unsafe_function; - using stack_aligned_stack_handler_function = basic_protected_function; + using stack_aligned_stack_handler_function = basic_protected_function; - struct unsafe_function_result; - struct protected_function_result; - using safe_function_result = protected_function_result; + struct unsafe_function_result; + struct protected_function_result; + using safe_function_result = protected_function_result; #if defined(SOL_SAFE_FUNCTION) && SOL_SAFE_FUNCTION - using function_result = safe_function_result; + using function_result = safe_function_result; #else - using function_result = unsafe_function_result; + using function_result = unsafe_function_result; +#endif + + template + class basic_object_base; + template + class basic_object; + template + class basic_userdata; + template + class basic_lightuserdata; + template + class basic_coroutine; + template + class basic_thread; + + using object = basic_object; + using userdata = basic_userdata; + using lightuserdata = basic_lightuserdata; + using thread = basic_thread; + using coroutine = basic_coroutine; + using main_object = basic_object; + using main_userdata = basic_userdata; + using main_lightuserdata = basic_lightuserdata; + using main_coroutine = basic_coroutine; + using stack_object = basic_object; + using stack_userdata = basic_userdata; + using stack_lightuserdata = basic_lightuserdata; + using stack_thread = basic_thread; + using stack_coroutine = basic_coroutine; + + struct stack_proxy_base; + struct stack_proxy; + struct variadic_args; + struct variadic_results; + struct stack_count; + struct this_state; + struct this_main_state; + struct this_environment; + + class state_view; + class state; + + template + struct as_table_t; + template + struct as_container_t; + template + struct nested; + template + struct light; + template + struct user; + template + struct as_args_t; + template + struct protect_t; + template + struct policy_wrapper; + + template + struct usertype_traits; + template + struct unique_usertype_traits; + + template + struct types { + typedef std::make_index_sequence indices; + static constexpr std::size_t size() { + return sizeof...(Args); + } + }; + + template + struct derive : std::false_type { + typedef types<> type; + }; + + template + struct base : std::false_type { + typedef types<> type; + }; + + template + struct weak_derive { + static bool value; + }; + + template + bool weak_derive::value = false; + + namespace stack { + struct record; + } + +#if !defined(SOL_USE_BOOST) || (SOL_USE_BOOST == 0) + template + class optional; + + template + class optional; #endif - template - class basic_object; - template - class basic_userdata; - template - class basic_lightuserdata; - template - class basic_coroutine; - template - class basic_thread; - - using object = basic_object; - using userdata = basic_userdata; - using lightuserdata = basic_lightuserdata; - using thread = basic_thread; - using coroutine = basic_coroutine; - using main_object = basic_object; - using main_userdata = basic_userdata; - using main_lightuserdata = basic_lightuserdata; - using main_coroutine = basic_coroutine; - using stack_object = basic_object; - using stack_userdata = basic_userdata; - using stack_lightuserdata = basic_lightuserdata; - using stack_thread = basic_thread; - using stack_coroutine = basic_coroutine; - - struct stack_proxy_base; - struct stack_proxy; - struct variadic_args; - struct variadic_results; - struct stack_count; - struct this_state; - struct this_main_state; - struct this_environment; - - template - struct as_table_t; - template - struct as_container_t; - template - struct nested; - template - struct light; - template - struct user; - template - struct as_args_t; - template - struct protect_t; - template - struct filter_wrapper; - - template - struct usertype_traits; - template - struct unique_usertype_traits; + using check_handler_type = int(lua_State*, int, type, type, const char*); + } // namespace sol +#define SOL_BASE_CLASSES(T, ...) \ + namespace sol { \ + template <> \ + struct base : std::true_type { \ + typedef ::sol::types<__VA_ARGS__> type; \ + }; \ + } \ + void a_sol3_detail_function_decl_please_no_collide() +#define SOL_DERIVED_CLASSES(T, ...) \ + namespace sol { \ + template <> \ + struct derive : std::true_type { \ + typedef ::sol::types<__VA_ARGS__> type; \ + }; \ + } \ + void a_sol3_detail_function_decl_please_no_collide() + +#endif // SOL_FORWARD_HPP // end of sol/forward.hpp -// beginning of sol/state.hpp +// beginning of sol/forward_detail.hpp -// beginning of sol/state_view.hpp +#ifndef SOL_FORWARD_DETAIL_HPP +#define SOL_FORWARD_DETAIL_HPP -// beginning of sol/error.hpp +// beginning of sol/traits.hpp -#include -#include +// beginning of sol/tuple.hpp + +// beginning of sol/base_traits.hpp namespace sol { - namespace detail { - struct direct_error_tag {}; - const auto direct_error = direct_error_tag{}; - } // namespace detail - - class error : public std::runtime_error { - private: - // Because VC++ is upsetting, most of the time! - std::string w; - - public: - error(const std::string& str) - : error(detail::direct_error, "lua: error: " + str) { - } - error(std::string&& str) - : error(detail::direct_error, "lua: error: " + std::move(str)) { - } - error(detail::direct_error_tag, const std::string& str) - : std::runtime_error(""), w(str) { - } - error(detail::direct_error_tag, std::string&& str) - : std::runtime_error(""), w(std::move(str)) { - } - - error(const error& e) = default; - error(error&& e) = default; - error& operator=(const error& e) = default; - error& operator=(error&& e) = default; - - virtual const char* what() const noexcept override { - return w.c_str(); - } - }; + namespace detail { + struct unchecked_t {}; + const unchecked_t unchecked = unchecked_t{}; + } // namespace detail -} // namespace sol + namespace meta { + using sfinae_yes_t = std::true_type; + using sfinae_no_t = std::false_type; -// end of sol/error.hpp + template + using void_t = void; -// beginning of sol/table.hpp + template + using unqualified = std::remove_cv>; -// beginning of sol/table_core.hpp + template + using unqualified_t = typename unqualified::type; -// beginning of sol/proxy.hpp + namespace meta_detail { + template + struct unqualified_non_alias : unqualified {}; -// beginning of sol/traits.hpp + template