celisej567/Nuake
1
0
Fork 0
mirror of https://github.com/antopilo/Nuake.git synced 2026-01-06 06:09:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Moved to glad

Browse Source
This commit is contained in:
Antoine Pilote
2023-09-27 17:14:43 -04:00
parent 7fdb3e11b7
commit 63f6904d59
35 changed files with 8105 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Editor/Editor.cpp
View File

@@ -1,4 +1,4 @@
#include <dependencies/GLEW/include/GL/glew.h>
#include <glad/glad.h>
#include <Engine.h>

2
Editor/src/Misc/ThumbnailManager.cpp
View File

@@ -3,7 +3,7 @@
#include <src/Vendors/glm/ext/matrix_clip_space.hpp>
#include <src/Rendering/SceneRenderer.h>
#include <src/Resource/ResourceLoader.h>
#include <GL/glew.h>
#include <glad/glad.h>
ThumbnailManager::ThumbnailManager()

2
Editor/src/Windows/EditorInterface.cpp
View File

@@ -20,7 +20,7 @@
#include "src/Vendors/glm/gtx/matrix_decompose.hpp"
#include "src/Resource/FontAwesome5.h"
#include "dependencies/GLEW/include/GL/glew.h"
#include <glad/glad.h>
#include "src/Scene/Scene.h"
#include "src/Scene/Components/Components.h"

311
Nuake/dependencies/glad/include/KHR/khrplatform.h Normal file
View File

@@ -0,0 +1,311 @@
#ifndef __khrplatform_h_
#define __khrplatform_h_
/*
** Copyright (c) 2008-2018 The Khronos Group Inc.
**
** Permission is hereby granted, free of charge, to any person obtaining a
** copy of this software and/or associated documentation files (the
** "Materials"), to deal in the Materials without restriction, including
** without limitation the rights to use, copy, modify, merge, publish,
** distribute, sublicense, and/or sell copies of the Materials, and to
** permit persons to whom the Materials are 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 Materials.
**
** THE MATERIALS ARE 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
** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
*/
/* Khronos platform-specific types and definitions.
*
* The master copy of khrplatform.h is maintained in the Khronos EGL
* Registry repository at https://github.com/KhronosGroup/EGL-Registry
* The last semantic modification to khrplatform.h was at commit ID:
* 67a3e0864c2d75ea5287b9f3d2eb74a745936692
*
* Adopters may modify this file to suit their platform. Adopters are
* encouraged to submit platform specific modifications to the Khronos
* group so that they can be included in future versions of this file.
* Please submit changes by filing pull requests or issues on
* the EGL Registry repository linked above.
*
*
* See the Implementer's Guidelines for information about where this file
* should be located on your system and for more details of its use:
* http://www.khronos.org/registry/implementers_guide.pdf
*
* This file should be included as
* #include <KHR/khrplatform.h>
* by Khronos client API header files that use its types and defines.
*
* The types in khrplatform.h should only be used to define API-specific types.
*
* Types defined in khrplatform.h:
* khronos_int8_t signed 8 bit
* khronos_uint8_t unsigned 8 bit
* khronos_int16_t signed 16 bit
* khronos_uint16_t unsigned 16 bit
* khronos_int32_t signed 32 bit
* khronos_uint32_t unsigned 32 bit
* khronos_int64_t signed 64 bit
* khronos_uint64_t unsigned 64 bit
* khronos_intptr_t signed same number of bits as a pointer
* khronos_uintptr_t unsigned same number of bits as a pointer
* khronos_ssize_t signed size
* khronos_usize_t unsigned size
* khronos_float_t signed 32 bit floating point
* khronos_time_ns_t unsigned 64 bit time in nanoseconds
* khronos_utime_nanoseconds_t unsigned time interval or absolute time in
* nanoseconds
* khronos_stime_nanoseconds_t signed time interval in nanoseconds
* khronos_boolean_enum_t enumerated boolean type. This should
* only be used as a base type when a client API's boolean type is
* an enum. Client APIs which use an integer or other type for
* booleans cannot use this as the base type for their boolean.
*
* Tokens defined in khrplatform.h:
*
* KHRONOS_FALSE, KHRONOS_TRUE Enumerated boolean false/true values.
*
* KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0.
* KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0.
*
* Calling convention macros defined in this file:
* KHRONOS_APICALL
* KHRONOS_APIENTRY
* KHRONOS_APIATTRIBUTES
*
* These may be used in function prototypes as:
*
* KHRONOS_APICALL void KHRONOS_APIENTRY funcname(
* int arg1,
* int arg2) KHRONOS_APIATTRIBUTES;
*/
#if defined(__SCITECH_SNAP__) && !defined(KHRONOS_STATIC)
# define KHRONOS_STATIC 1
#endif
/*-------------------------------------------------------------------------
* Definition of KHRONOS_APICALL
*-------------------------------------------------------------------------
* This precedes the return type of the function in the function prototype.
*/
#if defined(KHRONOS_STATIC)
/* If the preprocessor constant KHRONOS_STATIC is defined, make the
* header compatible with static linking. */
# define KHRONOS_APICALL
#elif defined(_WIN32)
# define KHRONOS_APICALL __declspec(dllimport)
#elif defined (__SYMBIAN32__)
# define KHRONOS_APICALL IMPORT_C
#elif defined(__ANDROID__)
# define KHRONOS_APICALL __attribute__((visibility("default")))
#else
# define KHRONOS_APICALL
#endif
/*-------------------------------------------------------------------------
* Definition of KHRONOS_APIENTRY
*-------------------------------------------------------------------------
* This follows the return type of the function and precedes the function
* name in the function prototype.
*/
#if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__)
/* Win32 but not WinCE */
# define KHRONOS_APIENTRY __stdcall
#else
# define KHRONOS_APIENTRY
#endif
/*-------------------------------------------------------------------------
* Definition of KHRONOS_APIATTRIBUTES
*-------------------------------------------------------------------------
* This follows the closing parenthesis of the function prototype arguments.
*/
#if defined (__ARMCC_2__)
#define KHRONOS_APIATTRIBUTES __softfp
#else
#define KHRONOS_APIATTRIBUTES
#endif
/*-------------------------------------------------------------------------
* basic type definitions
*-----------------------------------------------------------------------*/
#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__GNUC__) || defined(__SCO__) || defined(__USLC__)
/*
* Using <stdint.h>
*/
#include <stdint.h>
typedef int32_t khronos_int32_t;
typedef uint32_t khronos_uint32_t;
typedef int64_t khronos_int64_t;
typedef uint64_t khronos_uint64_t;
#define KHRONOS_SUPPORT_INT64 1
#define KHRONOS_SUPPORT_FLOAT 1
/*
* To support platform where unsigned long cannot be used interchangeably with
* inptr_t (e.g. CHERI-extended ISAs), we can use the stdint.h intptr_t.
* Ideally, we could just use (u)intptr_t everywhere, but this could result in
* ABI breakage if khronos_uintptr_t is changed from unsigned long to
* unsigned long long or similar (this results in different C++ name mangling).
* To avoid changes for existing platforms, we restrict usage of intptr_t to
* platforms where the size of a pointer is larger than the size of long.
*/
#if defined(__SIZEOF_LONG__) && defined(__SIZEOF_POINTER__)
#if __SIZEOF_POINTER__ > __SIZEOF_LONG__
#define KHRONOS_USE_INTPTR_T
#endif
#endif
#elif defined(__VMS ) || defined(__sgi)
/*
* Using <inttypes.h>
*/
#include <inttypes.h>
typedef int32_t khronos_int32_t;
typedef uint32_t khronos_uint32_t;
typedef int64_t khronos_int64_t;
typedef uint64_t khronos_uint64_t;
#define KHRONOS_SUPPORT_INT64 1
#define KHRONOS_SUPPORT_FLOAT 1
#elif defined(_WIN32) && !defined(__SCITECH_SNAP__)
/*
* Win32
*/
typedef __int32 khronos_int32_t;
typedef unsigned __int32 khronos_uint32_t;
typedef __int64 khronos_int64_t;
typedef unsigned __int64 khronos_uint64_t;
#define KHRONOS_SUPPORT_INT64 1
#define KHRONOS_SUPPORT_FLOAT 1
#elif defined(__sun__) || defined(__digital__)
/*
* Sun or Digital
*/
typedef int khronos_int32_t;
typedef unsigned int khronos_uint32_t;
#if defined(__arch64__) || defined(_LP64)
typedef long int khronos_int64_t;
typedef unsigned long int khronos_uint64_t;
#else
typedef long long int khronos_int64_t;
typedef unsigned long long int khronos_uint64_t;
#endif /* __arch64__ */
#define KHRONOS_SUPPORT_INT64 1
#define KHRONOS_SUPPORT_FLOAT 1
#elif 0
/*
* Hypothetical platform with no float or int64 support
*/
typedef int khronos_int32_t;
typedef unsigned int khronos_uint32_t;
#define KHRONOS_SUPPORT_INT64 0
#define KHRONOS_SUPPORT_FLOAT 0
#else
/*
* Generic fallback
*/
#include <stdint.h>
typedef int32_t khronos_int32_t;
typedef uint32_t khronos_uint32_t;
typedef int64_t khronos_int64_t;
typedef uint64_t khronos_uint64_t;
#define KHRONOS_SUPPORT_INT64 1
#define KHRONOS_SUPPORT_FLOAT 1
#endif
/*
* Types that are (so far) the same on all platforms
*/
typedef signed char khronos_int8_t;
typedef unsigned char khronos_uint8_t;
typedef signed short int khronos_int16_t;
typedef unsigned short int khronos_uint16_t;
/*
* Types that differ between LLP64 and LP64 architectures - in LLP64,
* pointers are 64 bits, but 'long' is still 32 bits. Win64 appears
* to be the only LLP64 architecture in current use.
*/
#ifdef KHRONOS_USE_INTPTR_T
typedef intptr_t khronos_intptr_t;
typedef uintptr_t khronos_uintptr_t;
#elif defined(_WIN64)
typedef signed long long int khronos_intptr_t;
typedef unsigned long long int khronos_uintptr_t;
#else
typedef signed long int khronos_intptr_t;
typedef unsigned long int khronos_uintptr_t;
#endif
#if defined(_WIN64)
typedef signed long long int khronos_ssize_t;
typedef unsigned long long int khronos_usize_t;
#else
typedef signed long int khronos_ssize_t;
typedef unsigned long int khronos_usize_t;
#endif
#if KHRONOS_SUPPORT_FLOAT
/*
* Float type
*/
typedef float khronos_float_t;
#endif
#if KHRONOS_SUPPORT_INT64
/* Time types
*
* These types can be used to represent a time interval in nanoseconds or
* an absolute Unadjusted System Time. Unadjusted System Time is the number
* of nanoseconds since some arbitrary system event (e.g. since the last
* time the system booted). The Unadjusted System Time is an unsigned
* 64 bit value that wraps back to 0 every 584 years. Time intervals
* may be either signed or unsigned.
*/
typedef khronos_uint64_t khronos_utime_nanoseconds_t;
typedef khronos_int64_t khronos_stime_nanoseconds_t;
#endif
/*
* Dummy value used to pad enum types to 32 bits.
*/
#ifndef KHRONOS_MAX_ENUM
#define KHRONOS_MAX_ENUM 0x7FFFFFFF
#endif
/*
* Enumerated boolean type
*
* Values other than zero should be considered to be true. Therefore
* comparisons should not be made against KHRONOS_TRUE.
*/
typedef enum {
KHRONOS_FALSE = 0,
KHRONOS_TRUE = 1,
KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM
} khronos_boolean_enum_t;
#endif /* __khrplatform_h_ */

5131
Nuake/dependencies/glad/include/glad/glad.h Normal file
View File

File diff suppressed because it is too large Load Diff

2518
Nuake/dependencies/glad/src/glad.c Normal file
View File

File diff suppressed because it is too large Load Diff

1
Nuake/src/Core/Logger.cpp
View File

@@ -16,7 +16,6 @@ namespace Nuake
struct tm timeinfo;
#ifdef NK_WIN
localtime_s(&timeinfo, &now);
strftime(buff, 100, "%H:%M:%S", &timeinfo);
#endif

2
Nuake/src/Rendering/Buffers/Framebuffer.cpp
View File

@@ -1,5 +1,5 @@
#include "Framebuffer.h"
#include "GL/glew.h"
#include <glad/glad.h>
namespace Nuake
{

3
Nuake/src/Rendering/Buffers/GBuffer.cpp
View File

@@ -1,5 +1,6 @@
#include "GBuffer.h"
#include "GL/glew.h"
#include <glad/glad.h>
GBuffer::GBuffer(glm::vec2 size)
{
m_Size = size;

2
Nuake/src/Rendering/Buffers/MSAAFramebuffer.cpp
View File

@@ -1,5 +1,5 @@
#include "MSAAFramebuffer.h"
#include <GL/glew.h>
#include <glad/glad.h>
namespace Nuake
{

2
Nuake/src/Rendering/Buffers/UniformBuffer.cpp
View File

@@ -1,5 +1,5 @@
#include "UniformBuffer.h"
#include <dependencies/GLEW/include/GL/glew.h>
#include <glad/glad.h>
namespace Nuake
{

41
Nuake/src/Rendering/Buffers/VertexBufferLayout.h
View File

@@ -31,6 +31,28 @@ namespace Nuake {
public:
VertexBufferLayout() : m_Stride(0) {}
#ifdef NK_WIN
template<typename T>
void Push(unsigned int count)
{
if constexpr (std::is_same_v<float, T>)
{
m_Elements.push_back({ RendererEnum::FLOAT, count, false });
m_Stride += VertexBufferElement::GetSizeOfType(RendererEnum::FLOAT) * count;
}
else if constexpr (std::is_same_v<unsigned int, T>)
{
m_Elements.push_back({ RendererEnum::UINT, count, false });
m_Stride += VertexBufferElement::GetSizeOfType(RendererEnum::UINT) * count;
}
else if constexpr (std::is_same_v<int, T>)
{
m_Elements.push_back({ RendererEnum::INT, count, false });
m_Stride += VertexBufferElement::GetSizeOfType(RendererEnum::INT) * count;
}
}
#endif
#ifdef NK_LINUX
template<typename T>
void Push(unsigned int count)
{
@@ -43,7 +65,7 @@ namespace Nuake {
if constexpr (std::is_same_v<T, unsigned int*>)
{
m_Elements.push_back({ RendererEnum::UINT, count, false });
m_Stride += VertexBufferElement::GetSizeOfType(RendererEnum::UINT) * count;
m_Stride += VertexBufferElement::GetSizeOfType(RendererEnum::UINT) * count;
}
if constexpr (std::is_same_v<T, int*>)
@@ -58,7 +80,7 @@ namespace Nuake {
m_Stride += VertexBufferElement::GetSizeOfType(RendererEnum::UBYTE) * count;
}
}
#endif
inline const std::vector<VertexBufferElement>& GetElements() const { return m_Elements; }
inline unsigned int GetStride() const { return m_Stride; }
@@ -66,26 +88,33 @@ namespace Nuake {
#ifdef NK_WIN
#ifdef NK_WINs
template<>
void VertexBufferLayout::Push<float>(unsigned int count)
{
m_Elements.push_back({ RendererEnum::FLOAT, count, false });
m_Stride += VertexBufferElement::GetSizeOfType(RendererEnum::FLOAT) * count;
}
template<>
void VertexBufferLayout::Push<unsigned int>(unsigned int count)
{
m_Elements.push_back({ RendererEnum::UINT, count, false });
m_Stride += VertexBufferElement::GetSizeOfType(RendererEnum::UINT) * count;
};
}
template<>
void VertexBufferLayout::Push<int>(unsigned int count)
{
m_Elements.push_back({ RendererEnum::INT, count, false });
m_Stride += VertexBufferElement::GetSizeOfType(RendererEnum::INT) * count;
};
}
template<>
void VertexBufferLayout::Push<unsigned char>(unsigned int count)
{
m_Elements.push_back({ RendererEnum::UBYTE, count, true });
m_Stride += VertexBufferElement::GetSizeOfType(RendererEnum::UBYTE) * count;
};
}
#endif
}

2
Nuake/src/Rendering/Light.cpp
View File

@@ -1,7 +1,7 @@
#include "Light.h"
#include <src/Vendors/glm/ext/matrix_clip_space.hpp>
#include "src/Rendering/RenderCommand.h"
#include <dependencies/GLEW/include/GL/glew.h>
#include <glad/glad.h>
namespace Nuake
{

3
Nuake/src/Rendering/Platforms/OGLRendererAPI.cpp
View File

@@ -1,7 +1,8 @@
#include "OGLRendererAPI.h"
#include "GL/glew.h"
#include "glad/glad.h"
namespace Nuake {
void OGLRendererAPI::Enable(const RendererEnum enumType)
{
glEnable(GetType(enumType));

2
Nuake/src/Rendering/PostFX/Bloom.cpp
View File

@@ -1,5 +1,5 @@
#include "Bloom.h"
#include <dependencies/GLEW/include/GL/glew.h>
#include <glad/glad.h>
#include "src/Rendering/Renderer.h"
#include <src/Vendors/imgui/imgui.h>
#include "Engine.h"

2
Nuake/src/Rendering/PostFX/SSAO.cpp
View File

@@ -5,7 +5,7 @@
#include "src/Rendering/Shaders/ShaderManager.h"
#include "src/Rendering/Renderer.h"
#include <GL/glew.h>
#include <glad/glad.h>
#include <random>
#include <src/Vendors/imgui/imgui.h>

2
Nuake/src/Rendering/PostFX/SSR.cpp
View File

@@ -1,5 +1,5 @@
#include "SSR.h"
#include <dependencies/GLEW/include/GL/glew.h>
#include <glad/glad.h>
#include "src/Rendering/RenderCommand.h"
#include "src/Rendering/Renderer.h"
#include <src/Vendors/imgui/imgui.h>

2
Nuake/src/Rendering/PostFX/Volumetric.cpp
View File

@@ -1,7 +1,7 @@
#include "Volumetric.h"
#include "src/Rendering/Shaders/ShaderManager.h"
#include "src/Rendering/Renderer.h"
#include <dependencies/GLEW/include/GL/glew.h>
#include <glad/glad.h>
#include <src/Vendors/imgui/imgui.h>
namespace Nuake {
Volumetric::Volumetric()

2
Nuake/src/Rendering/Renderer.cpp
View File

@@ -1,6 +1,6 @@
#include "Renderer.h"
#include <GL/glew.h>
#include <glad/glad.h>
#include "RenderCommand.h"

2
Nuake/src/Rendering/Renderer2D.cpp
View File

@@ -1,5 +1,5 @@
#include "Renderer2D.h"
#include "GL/glew.h"
#include <glad/glad.h>
#include <Engine.h>
#include "src/UI/Nodes/TextNode.h"
#include "Shaders/ShaderManager.h"

2
Nuake/src/Rendering/SceneRenderer.cpp
View File

@@ -5,7 +5,7 @@
#include "src/Scene/Components/SpriteComponent.h"
#include "src/Scene/Components/ParticleEmitterComponent.h"
#include <GL/glew.h>
#include <glad/glad.h>
#include <src/Scene/Components/SkinnedModelComponent.h>
#include <src/Vendors/imgui/imgui.h>

2
Nuake/src/Rendering/Shaders/Shader.cpp
View File

@@ -4,7 +4,7 @@
#include "src/Core/Logger.h"
#include <sstream>
#include <GL/glew.h>
#include <glad/glad.h>
namespace Nuake

2
Nuake/src/Rendering/Textures/Cubemap.cpp
View File

@@ -1,5 +1,5 @@
#include "Cubemap.h"
#include <GL/glew.h>
#include <glad/glad.h>
#include <iostream>
#include "HDR.h"

2
Nuake/src/Rendering/Textures/HDR.cpp
View File

@@ -1,5 +1,5 @@
#include "HDR.h"
#include <GL/glew.h>
#include <glad/glad.h>
#include <iostream>
#include "src/Rendering/Renderer.h"

2
Nuake/src/Rendering/Textures/Material.cpp
View File

@@ -9,7 +9,7 @@
#include <sstream>
#include <vector>
#include <GL/glew.h>
#include <glad/glad.h>
namespace Nuake
{

2
Nuake/src/Rendering/Textures/MultiSampledTexture.cpp
View File

@@ -1,5 +1,5 @@
#include "MultiSampledTexture.h"
#include <GL/glew.h>
#include <glad/glad.h>
#include <iostream>
namespace Nuake

2
Nuake/src/Rendering/Textures/Texture.cpp
View File

@@ -1,6 +1,6 @@
#include "Texture.h"
#include "src/Core/Logger.h"
#include <GL/glew.h>
#include <glad/glad.h>
#include <iostream>
#include <src/Core/FileSystem.h>

2
Nuake/src/Rendering/Textures/TextureManager.cpp
View File

@@ -2,7 +2,7 @@
#include "src/Rendering/Textures/Texture.h"
#include "src/Resource/StaticResources.h"
#include <GL/glew.h>
#include <glad/glad.h>
namespace Nuake
{

2
Nuake/src/Scene/Components/LightComponent.cpp
View File

@@ -3,7 +3,7 @@
#include "LightComponent.h"
#include "src/Rendering/Renderer.h"
#include <GL/glew.h>
#include <glad/glad.h>
#include "src/Core/Core.h"
#include <src/Scene/Entities/ImGuiHelper.h>

2
Nuake/src/Scene/Environment/ProceduralSky.cpp
View File

@@ -4,7 +4,7 @@
#include "src/Rendering/Shaders/Shader.h"
#include "src/Rendering/Camera.h"
#include <GL/glew.h>
#include <glad/glad.h>
namespace Nuake
{

2
Nuake/src/Scene/Environment/Skybox.cpp
View File

@@ -1,5 +1,5 @@
#include "Skybox.h"
#include <GL/glew.h>
#include <glad/glad.h>
#include "src/Rendering/Renderer.h"
#include "src/Rendering/Textures/Cubemap.h"

2
Nuake/src/Scene/Environment/SkyboxHDR.cpp
View File

@@ -1,5 +1,5 @@
#include "SkyboxHDR.h"
#include <GL/glew.h>
#include <glad/glad.h>
#include "src/Rendering/Renderer.h"
#include "src/Rendering/Textures/Cubemap.h"

2
Nuake/src/Scene/Scene.cpp
View File

@@ -18,7 +18,7 @@
#include "src/Rendering/Renderer.h"
#include "src/Rendering/Textures/MaterialManager.h"
#include <GL/glew.h>
#include <glad/glad.h>
#include "Engine.h"
#include "src/Core/Maths.h"

11
Nuake/src/Window.cpp
View File

@@ -1,7 +1,7 @@
#include "Window.h"
#include <GL/glew.h>
#include <glad/glad.h>
#include <GLFW/glfw3.h>
#include "Engine.h"
@@ -67,18 +67,17 @@ namespace Nuake
}
SetWindowIcon("resources/Images/nuake-logo.png");
glfwMakeContextCurrent(m_Window);
SetVSync(false);
Logger::Log("Driver detected " + std::string(((char*)glGetString(GL_VERSION))), "renderer");
if (glewInit() != GLEW_OK)
if (!gladLoadGLLoader((GLADloadproc)glfwGetProcAddress))
{
Logger::Log("GLEW initialization failed!", "window", CRITICAL);
Logger::Log("glad initialization failed!", "window", CRITICAL);
return -1;
}
Logger::Log("Driver detected " + std::string(((char*)glGetString(GL_VERSION))), "renderer");
if (glfwRawMouseMotionSupported())
glfwSetInputMode(m_Window, GLFW_RAW_MOUSE_MOTION, GLFW_TRUE);

138
premake5.lua
View File

@@ -8,9 +8,22 @@ workspace "Nuake"
"Dist"
}
filter "configurations:Dist"
defines
{
"NK_DIST"
}
filter "configurations:Debug"
defines
{
"NK_DEBUG"
}
outputdir = "%{cfg.buildcfg}-%{cfg.system}-%{cfg.architecture}"
include "Nuake/dependencies/glfw_p5.lua"
include "Nuake/dependencies/glad_p5.lua"
include "Nuake/dependencies/assimp_p5.lua"
include "Nuake/dependencies/freetype_p5.lua"
include "Nuake/dependencies/jolt_p5.lua"
@@ -20,15 +33,16 @@ include "Nuake/dependencies/optick_p5.lua"
project "Nuake"
location "Nuake"
kind "StaticLib"
staticruntime "On"
language "C++"
cppdialect "C++20"
defines
{
"GLEW_STATIC",
"_MBCS"
}
targetdir ("bin/" .. outputdir .. "/%{prj.name}")
objdir ("bin-int/" .. outputdir .. "/%{prj.name}")
@@ -48,25 +62,25 @@ project "Nuake"
"%{prj.name}/src/Vendors/wren/src/vm/*.c",
"%{prj.name}/src/Vendors/katana-parser/*.h",
"%{prj.name}/src/Vendors/katana-parser/*.c",
"%{prj.name}/../Nuake/src/Vendors/incbin/*.c",
"%{prj.name}/../Nuake/src/Vendors/incbin/*.h"
"%{prj.name}/src/Vendors/incbin/*.c",
"%{prj.name}/src/Vendors/incbin/*.h"
}
includedirs
{
"%{prj.name}/../Nuake",
"%{prj.name}/../Nuake/src/Vendors",
"%{prj.name}/../Nuake/dependencies/GLEW/include",
"%{prj.name}/../Nuake/dependencies/glfw/include",
"%{prj.name}/../Nuake/dependencies/assimp/include",
"%{prj.name}/../Nuake/dependencies/JoltPhysics",
"%{prj.name}/../Nuake/src/Vendors/msdfgen/include",
"%{prj.name}/../Nuake/src/Vendors/msdfgen/freetype/include",
"%{prj.name}/../Nuake/src/Vendors/msdfgen",
"%{prj.name}/../Nuake/src/Vendors/wren/src/include",
"%{prj.name}/../Nuake/src/Vendors/incbin",
"%{prj.name}/../Nuake/dependencies/build",
"%{prj.name}/../Nuake/dependencies/soloud/include"
"%{prj.name}",
"%{prj.name}/src/Vendors",
"%{prj.name}/dependencies/glad/include",
"%{prj.name}/dependencies/glfw/include",
"%{prj.name}/dependencies/assimp/include",
"%{prj.name}/dependencies/JoltPhysics",
"%{prj.name}/src/Vendors/msdfgen/include",
"%{prj.name}/src/Vendors/msdfgen/freetype/include",
"%{prj.name}/src/Vendors/msdfgen",
"%{prj.name}/src/Vendors/wren/src/include",
"%{prj.name}/src/Vendors/incbin",
"%{prj.name}/dependencies/build",
"%{prj.name}/dependencies/soloud/include"
}
links
@@ -76,17 +90,15 @@ project "Nuake"
}
filter "system:linux"
cppdialect "C++20"
staticruntime "On"
defines {
"NK_LINUX",
"GLFW_STATIC",
"GLEW_NO_GLU"
"NK_LINUX"
}
filter "system:windows"
cppdialect "C++20"
staticruntime "On"
defines {
defines
{
"NK_WIN"
}
@@ -95,10 +107,6 @@ project "Nuake"
filter "configurations:Debug"
runtime "Debug"
symbols "on"
defines
{
"NK_DEBUG"
}
filter "configurations:Release"
runtime "Release"
@@ -107,10 +115,7 @@ project "Nuake"
filter "configurations:Dist"
runtime "Release"
optimize "on"
defines
{
"NK_DIST"
}
project "NuakeRuntime"
location "Runtime"
@@ -130,7 +135,7 @@ project "NuakeRuntime"
{
"%{prj.name}/../Nuake",
"%{prj.name}/../Nuake/src/Vendors",
"%{prj.name}/../Nuake/Dependencies/GLEW/include",
"%{prj.name}/../Nuake/Dependencies/glad/include",
"%{prj.name}/../Nuake/Dependencies/GLFW/include",
"%{prj.name}/../Nuake/Dependencies/assimp/include",
"%{prj.name}/../Nuake/Dependencies/build",
@@ -142,8 +147,6 @@ project "NuakeRuntime"
libdirs
{
"%{prj.name}/../Nuake/dependencies/GLEW/lib/Release/x64",
"%{prj.name}/../Nuake/dependencies/GLEW/lib/Release/Linux",
"%{prj.name}/../Nuake/dependencies/assimp/lib/",
"%{prj.name}/../Nuake/dependencies/freetype-windows-binaries/release static/win64",
"%{prj.name}/../bin/%{cfg.buildcfg}-%{cfg.system}-%{cfg.architecture}/Nuake/",
@@ -159,6 +162,7 @@ project "NuakeRuntime"
{
"Nuake",
"GLFW",
"glad",
"assimp",
"Freetype",
"JoltPhysics",
@@ -179,14 +183,14 @@ project "NuakeRuntime"
filter "system:linux"
links
{
"GL",
"GLEW"
"GL"
}
filter "configurations:Debug"
runtime "Debug"
symbols "on"
defines {
defines
{
"NK_DEBUG"
}
@@ -194,15 +198,18 @@ project "NuakeRuntime"
kind "WindowedApp"
runtime "Release"
optimize "on"
defines {
defines
{
"NK_DIST",
"WIN32_LEAN_AND_MEAN"
}
entrypoint "WinMainCRTStartup"
buildoptions { "-mwindows"}
filter "configurations:Dist"
kind "WindowedApp"
kind "WindowedApp"
runtime "Release"
optimize "on"
flags { "WinMain" }
@@ -211,16 +218,14 @@ project "NuakeRuntime"
"NK_DIST"
}
-- copy a file from the objects directory to the target directory
postbuildcommands {
--"{COPY} "Nuake/dependencies/GLFW/lib-vc2019/glfw3.dll" " .. "./bin/" .. outputdir .. "/%{prj.name}/glfw3.dll"
}
project "Editor"
location "Editor"
kind "ConsoleApp"
language "C++"
cppdialect "C++20"
staticruntime "On"
targetdir ("bin/" .. outputdir .. "/%{prj.name}")
objdir ("bin-int/" .. outputdir .. "/%{prj.name}")
debugdir ("%{prj.name}")
@@ -236,7 +241,7 @@ project "Editor"
{
"%{prj.name}/../Nuake",
"%{prj.name}/../Nuake/src/Vendors",
"%{prj.name}/../Nuake/dependencies/GLEW/include",
"%{prj.name}/../Nuake/dependencies/glad/include",
"%{prj.name}/../Nuake/dependencies/glfw/include",
"%{prj.name}/../Nuake/dependencies/assimp/include",
"%{prj.name}/../Nuake/dependencies/build",
@@ -263,7 +268,7 @@ project "Editor"
links
{
"Nuake",
"GLEW",
"glad",
"GLFW",
"assimp",
"Freetype",
@@ -271,38 +276,42 @@ project "Editor"
"soloud"
}
filter "system:windows"
cppdialect "C++20"
staticruntime "On"
filter "system:Windows"
links
{
"OpenGL32"
}
files
{
"%{prj.name}/resources/*.rc",
"%{prj.name}/resources/**.ico"
"%{prj.name}/resources/*.rc",
"%{prj.name}/resources/**.ico"
}
defines
{
"NK_WIN"
}
filter "system:linux"
links
{
"GL",
"GLEW",
"glfw3",
"glad",
"X11"
}
cppdialect "C++20"
staticruntime "On"
defines {
"NK_LINUX",
"GLFW_STATIC"
defines
{
"GLFW_STATIC",
"NK_LINUX"
}
filter "configurations:Debug"
runtime "Debug"
symbols "on"
defines {
"NK_DEBUG",
defines
{
"WIN32_LEAN_AND_MEAN"
}
@@ -311,14 +320,17 @@ project "Editor"
optimize "on"
filter "configurations:Dist"
kind "WindowedApp"
runtime "Release"
optimize "on"
defines {
"NK_DIST",
defines
{
"WIN32_LEAN_AND_MEAN"
}
-- Removes the console for windows
filter {"configurations:Dist", "platforms:windows"}
kind "WindowedApp"
-- copy a file from the objects directory to the target directory
postbuildcommands {
--"{COPY} "Nuake/dependencies/GLFW/lib-vc2019/glfw3.dll" " .. "./bin/" .. outputdir .. "/%{prj.name}/glfw3.dll"