mirror of
https://github.com/gwm17/Specter.git
synced 2024-11-22 18:28:52 -05:00
Working Winodw on Linux with OpenGLgit add -A . No support for Windows, Mac debatable
This commit is contained in:
parent
afe2053151
commit
d3bae6e11d
|
@ -9,6 +9,9 @@ namespace Navigator {
|
|||
{
|
||||
s_instance = this;
|
||||
|
||||
m_window = std::unique_ptr<Window>(Window::Create());
|
||||
m_window->SetEventCallback(BIND_EVENT_FUNCTION(Application::OnEvent));
|
||||
|
||||
PushLayer(new Layer());
|
||||
}
|
||||
|
||||
|
@ -19,6 +22,12 @@ namespace Navigator {
|
|||
{
|
||||
EventDispatcher dispatch(event);
|
||||
dispatch.Dispatch<WindowCloseEvent>(BIND_EVENT_FUNCTION(Application::OnWindowCloseEvent));
|
||||
for(auto iter = m_stack.end(); iter != m_stack.begin(); )
|
||||
{
|
||||
(*(--iter))->OnEvent(event);
|
||||
if(event.handledFlag)
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
bool Application::OnWindowCloseEvent(WindowCloseEvent& event)
|
||||
|
@ -47,8 +56,8 @@ namespace Navigator {
|
|||
NAV_TRACE("Doing a run.");
|
||||
for(auto layer : m_stack)
|
||||
NAV_TRACE("Layer with name {0} found!", layer->GetName());
|
||||
WindowCloseEvent event;
|
||||
OnEvent(event);
|
||||
|
||||
m_window->OnUpdate();
|
||||
}
|
||||
}
|
||||
}
|
|
@ -6,6 +6,7 @@
|
|||
#include "Events/AppEvent.h"
|
||||
#include "LayerStack.h"
|
||||
#include "Layer.h"
|
||||
#include "Window.h"
|
||||
|
||||
namespace Navigator {
|
||||
|
||||
|
@ -29,6 +30,7 @@ namespace Navigator {
|
|||
bool OnWindowCloseEvent(WindowCloseEvent& event);
|
||||
|
||||
LayerStack m_stack;
|
||||
std::unique_ptr<Window> m_window;
|
||||
bool m_runFlag;
|
||||
|
||||
static Application* s_instance;
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef EVENT_H
|
||||
#define EVENT_H
|
||||
|
||||
#include "NavCore.h"
|
||||
#include "Navigator/NavCore.h"
|
||||
|
||||
namespace Navigator {
|
||||
|
||||
|
|
15
Navigator/src/Navigator/GraphicsContext.h
Normal file
15
Navigator/src/Navigator/GraphicsContext.h
Normal file
|
@ -0,0 +1,15 @@
|
|||
#ifndef GRAPHICS_CONTEXT_H
|
||||
#define GRAPHICS_CONTEXT_H
|
||||
|
||||
namespace Navigator {
|
||||
|
||||
class GraphicsContext
|
||||
{
|
||||
public:
|
||||
virtual void Init() = 0;
|
||||
virtual void SwapBuffers() = 0;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif
|
|
@ -1,6 +1,14 @@
|
|||
#ifndef NAVCORE_H
|
||||
#define NAVCORE_H
|
||||
|
||||
#ifdef NAV_WINDOWS
|
||||
#error "Navigator is not compatible with Windows!"
|
||||
#endif
|
||||
|
||||
#ifdef NAV_APPLE
|
||||
#error "Navigator is not compatible with MacOS!"
|
||||
#endif
|
||||
|
||||
//Bit field setter
|
||||
#define BIT(x) (1<<x)
|
||||
|
||||
|
|
45
Navigator/src/Navigator/Window.h
Normal file
45
Navigator/src/Navigator/Window.h
Normal file
|
@ -0,0 +1,45 @@
|
|||
#ifndef WINDOW_H
|
||||
#define WINDOW_H
|
||||
|
||||
#include "NavCore.h"
|
||||
#include "Events/Event.h"
|
||||
|
||||
namespace Navigator {
|
||||
|
||||
class WindowProperties
|
||||
{
|
||||
public:
|
||||
unsigned int width, height;
|
||||
std::string name;
|
||||
|
||||
WindowProperties(const std::string& title="Navigator", unsigned int w=1280, unsigned int h=720) :
|
||||
width(w), height(h), name(title)
|
||||
{
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
class Window
|
||||
{
|
||||
public:
|
||||
|
||||
using EventCallbackFunc = std::function<void(Event&)>;
|
||||
|
||||
virtual ~Window() {}
|
||||
|
||||
virtual void OnUpdate() = 0;
|
||||
virtual unsigned int GetWidth() const = 0;
|
||||
virtual unsigned int GetHeight() const = 0;
|
||||
virtual std::string GetName() const = 0;
|
||||
|
||||
virtual void SetEventCallback(const EventCallbackFunc& function) = 0;
|
||||
virtual void SetVSync(bool enabled) = 0;
|
||||
virtual bool IsVSync() const = 0;
|
||||
|
||||
virtual void* GetNativeWindow() const =0;
|
||||
|
||||
static Window* Create(const WindowProperties& props = WindowProperties());
|
||||
};
|
||||
}
|
||||
|
||||
#endif
|
33
Navigator/src/Platform/OpenGL/OpenGLContext.cpp
Normal file
33
Navigator/src/Platform/OpenGL/OpenGLContext.cpp
Normal file
|
@ -0,0 +1,33 @@
|
|||
#include "OpenGLContext.h"
|
||||
|
||||
#include "GLFW/glfw3.h"
|
||||
#include "glad/glad.h"
|
||||
|
||||
namespace Navigator {
|
||||
|
||||
OpenGLContext::OpenGLContext(GLFWwindow* window) :
|
||||
m_windowHandle(window)
|
||||
{
|
||||
}
|
||||
|
||||
OpenGLContext::~OpenGLContext() {}
|
||||
|
||||
void OpenGLContext::Init()
|
||||
{
|
||||
glfwMakeContextCurrent(m_windowHandle);
|
||||
|
||||
int status = gladLoadGLLoader((GLADloadproc)glfwGetProcAddress);
|
||||
|
||||
NAV_TRACE("Loaded OpenGL with glad Init status {0}", status);
|
||||
|
||||
NAV_INFO("Loaded OpenGL renderer");
|
||||
NAV_INFO("Vendor: {0}", glGetString(GL_VENDOR));
|
||||
NAV_INFO("Renderer: {0}", glGetString(GL_RENDERER));
|
||||
NAV_INFO("Version: {0}", glGetString(GL_VERSION));
|
||||
}
|
||||
|
||||
void OpenGLContext::SwapBuffers()
|
||||
{
|
||||
glfwSwapBuffers(m_windowHandle);
|
||||
}
|
||||
}
|
24
Navigator/src/Platform/OpenGL/OpenGLContext.h
Normal file
24
Navigator/src/Platform/OpenGL/OpenGLContext.h
Normal file
|
@ -0,0 +1,24 @@
|
|||
#ifndef OPEGL_CONTEXT_H
|
||||
#define OPEGL_CONTEXT_H
|
||||
|
||||
#include "Navigator/GraphicsContext.h"
|
||||
|
||||
struct GLFWwindow;
|
||||
|
||||
namespace Navigator {
|
||||
|
||||
class OpenGLContext : public GraphicsContext
|
||||
{
|
||||
public:
|
||||
OpenGLContext(GLFWwindow* window);
|
||||
~OpenGLContext();
|
||||
|
||||
virtual void Init() override;
|
||||
virtual void SwapBuffers() override;
|
||||
private:
|
||||
GLFWwindow* m_windowHandle;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif
|
162
Navigator/src/Platform/OpenGL/OpenGLWindow.cpp
Normal file
162
Navigator/src/Platform/OpenGL/OpenGLWindow.cpp
Normal file
|
@ -0,0 +1,162 @@
|
|||
#include "OpenGLWindow.h"
|
||||
#include "OpenGLContext.h"
|
||||
#include "Navigator/NavCore.h"
|
||||
#include "Navigator/Events/AppEvent.h"
|
||||
#include "Navigator/Events/KeyEvent.h"
|
||||
#include "Navigator/Events/MouseEvent.h"
|
||||
|
||||
namespace Navigator {
|
||||
|
||||
static bool s_glfwInitialized = false;
|
||||
static void GLFWErrorCallback(int error, const char* description)
|
||||
{
|
||||
NAV_ERROR("GLFW Error Code {0}: {1}", error, description);
|
||||
}
|
||||
|
||||
Window* Window::Create(const WindowProperties& props) { return new OpenGLWindow(props); }
|
||||
|
||||
OpenGLWindow::OpenGLWindow(const WindowProperties& props)
|
||||
{
|
||||
Init(props);
|
||||
}
|
||||
|
||||
OpenGLWindow::~OpenGLWindow()
|
||||
{
|
||||
Shutdown();
|
||||
}
|
||||
|
||||
void OpenGLWindow::Init(const WindowProperties& props)
|
||||
{
|
||||
m_data.width = props.width;
|
||||
m_data.height = props.height;
|
||||
m_data.name = props.name;
|
||||
|
||||
NAV_INFO("Creating OpenGLWindow with height {0} width {1} and name {2}", m_data.height, m_data.width, m_data.name);
|
||||
|
||||
if(!s_glfwInitialized)
|
||||
{
|
||||
int passed = glfwInit();
|
||||
NAV_INFO("Initializing GLFW ... Returned value {0}", passed);
|
||||
glfwSetErrorCallback(GLFWErrorCallback);
|
||||
}
|
||||
|
||||
m_window = glfwCreateWindow((int)m_data.width, (int)m_data.height, m_data.name.c_str(), nullptr, nullptr);
|
||||
|
||||
m_context = new OpenGLContext(m_window);
|
||||
m_context->Init();
|
||||
|
||||
glfwSetWindowUserPointer(m_window, &m_data);
|
||||
SetVSync(true);
|
||||
|
||||
glfwSetWindowSizeCallback(m_window, [](GLFWwindow* window, int width, int height)
|
||||
{
|
||||
Data& data = *(Data*) glfwGetWindowUserPointer(window);
|
||||
data.width = width;
|
||||
data.height = height;
|
||||
WindowResizeEvent event(width, height);
|
||||
data.event_callback_func(event);
|
||||
});
|
||||
|
||||
glfwSetWindowCloseCallback(m_window, [](GLFWwindow* window)
|
||||
{
|
||||
Data& data = *(Data*) glfwGetWindowUserPointer(window);
|
||||
WindowCloseEvent event;
|
||||
data.event_callback_func(event);
|
||||
});
|
||||
|
||||
glfwSetKeyCallback(m_window, [](GLFWwindow* window, int key, int scancode, int action, int mods)
|
||||
{
|
||||
Data& data = *(Data*) glfwGetWindowUserPointer(window);
|
||||
switch(action)
|
||||
{
|
||||
case GLFW_PRESS:
|
||||
{
|
||||
KeyPressedEvent event(key, 0);
|
||||
data.event_callback_func(event);
|
||||
break;
|
||||
}
|
||||
case GLFW_RELEASE:
|
||||
{
|
||||
KeyReleasedEvent event(key);
|
||||
data.event_callback_func(event);
|
||||
break;
|
||||
}
|
||||
case GLFW_REPEAT:
|
||||
{
|
||||
//GLFW doesnt have a hold count, so here we just pass 1 to indicate a hold is happening.
|
||||
KeyPressedEvent event(key, 1);
|
||||
data.event_callback_func(event);
|
||||
break;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
glfwSetCharCallback(m_window, [](GLFWwindow* window, unsigned int character)
|
||||
{
|
||||
Data& data = *(Data*) glfwGetWindowUserPointer(window);
|
||||
KeyTypedEvent event(character);
|
||||
data.event_callback_func(event);
|
||||
});
|
||||
|
||||
glfwSetMouseButtonCallback(m_window, [](GLFWwindow* window, int button, int action, int mods)
|
||||
{
|
||||
Data& data = *(Data*) glfwGetWindowUserPointer(window);
|
||||
switch(action)
|
||||
{
|
||||
case GLFW_PRESS:
|
||||
{
|
||||
MouseButtonPressedEvent event(button);
|
||||
data.event_callback_func(event);
|
||||
}
|
||||
case GLFW_RELEASE:
|
||||
{
|
||||
MouseButtonReleasedEvent event(button);
|
||||
data.event_callback_func(event);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
glfwSetScrollCallback(m_window, [](GLFWwindow* window, double xoffset, double yoffset)
|
||||
{
|
||||
Data& data = *(Data*) glfwGetWindowUserPointer(window);
|
||||
MouseScrolledEvent event(xoffset, yoffset);
|
||||
data.event_callback_func(event);
|
||||
});
|
||||
|
||||
glfwSetCursorPosCallback(m_window, [](GLFWwindow* window, double xpos, double ypos)
|
||||
{
|
||||
Data& data = *(Data*) glfwGetWindowUserPointer(window);
|
||||
MouseMovedEvent event((float)xpos, (float)ypos);
|
||||
data.event_callback_func(event);
|
||||
});
|
||||
}
|
||||
|
||||
void OpenGLWindow::Shutdown()
|
||||
{
|
||||
glfwDestroyWindow(m_window);
|
||||
}
|
||||
|
||||
void OpenGLWindow::OnUpdate()
|
||||
{
|
||||
glfwPollEvents();
|
||||
m_context->SwapBuffers();
|
||||
}
|
||||
|
||||
void OpenGLWindow::SetVSync(bool enabled)
|
||||
{
|
||||
if(enabled)
|
||||
{
|
||||
glfwSwapInterval(1);
|
||||
}
|
||||
else
|
||||
{
|
||||
glfwSwapInterval(0);
|
||||
}
|
||||
m_data.vsyncFlag = enabled;
|
||||
}
|
||||
|
||||
bool OpenGLWindow::IsVSync() const
|
||||
{
|
||||
return m_data.vsyncFlag;
|
||||
}
|
||||
}
|
47
Navigator/src/Platform/OpenGL/OpenGLWindow.h
Normal file
47
Navigator/src/Platform/OpenGL/OpenGLWindow.h
Normal file
|
@ -0,0 +1,47 @@
|
|||
#ifndef OPENGL_WINDOW_H
|
||||
#define OPENGL_WINDOW_H
|
||||
|
||||
#include "Navigator/Window.h"
|
||||
#include "Navigator/GraphicsContext.h"
|
||||
#include "GLFW/glfw3.h"
|
||||
|
||||
namespace Navigator {
|
||||
|
||||
class OpenGLWindow : public Window
|
||||
{
|
||||
|
||||
public:
|
||||
OpenGLWindow(const WindowProperties& props);
|
||||
virtual ~OpenGLWindow();
|
||||
|
||||
void OnUpdate() override;
|
||||
|
||||
inline void SetEventCallback(const EventCallbackFunc& function) override { m_data.event_callback_func = function; }
|
||||
inline unsigned int GetWidth() const override { return m_data.width; }
|
||||
inline unsigned int GetHeight() const override { return m_data.height; }
|
||||
inline std::string GetName() const override { return m_data.name; }
|
||||
void SetVSync(bool enabled) override;
|
||||
bool IsVSync() const override;
|
||||
|
||||
inline virtual void* GetNativeWindow() const override { return m_window; }
|
||||
private:
|
||||
virtual void Init(const WindowProperties& props);
|
||||
virtual void Shutdown();
|
||||
|
||||
GraphicsContext* m_context;
|
||||
|
||||
GLFWwindow* m_window;
|
||||
|
||||
struct Data
|
||||
{
|
||||
int height, width;
|
||||
std::string name;
|
||||
bool vsyncFlag;
|
||||
EventCallbackFunc event_callback_func;
|
||||
};
|
||||
|
||||
Data m_data;
|
||||
};
|
||||
}
|
||||
|
||||
#endif
|
311
Navigator/vendor/glad/include/KHR/khrplatform.h
vendored
Normal file
311
Navigator/vendor/glad/include/KHR/khrplatform.h
vendored
Normal 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_ */
|
3694
Navigator/vendor/glad/include/glad/glad.h
vendored
Normal file
3694
Navigator/vendor/glad/include/glad/glad.h
vendored
Normal file
File diff suppressed because it is too large
Load Diff
31
Navigator/vendor/glad/premake5.lua
vendored
Normal file
31
Navigator/vendor/glad/premake5.lua
vendored
Normal file
|
@ -0,0 +1,31 @@
|
|||
|
||||
project "GLAD"
|
||||
kind "StaticLib"
|
||||
language "C"
|
||||
staticruntime "on"
|
||||
|
||||
targetdir ("bin/" .. outputdir .. "/%{prj.name}")
|
||||
objdir ("bin-int/" .. outputdir .. "/%{prj.name}")
|
||||
|
||||
files {
|
||||
"include/glad/glad.h",
|
||||
"include/KHR/khrplatform.h",
|
||||
"src/glad.c"
|
||||
}
|
||||
|
||||
includedirs {
|
||||
"include"
|
||||
}
|
||||
|
||||
filter "system:windows"
|
||||
systemversion "latest"
|
||||
filter "system:linux or macosx"
|
||||
pic "on"
|
||||
|
||||
filter "configurations:Debug"
|
||||
runtime "Debug"
|
||||
symbols "on"
|
||||
|
||||
filter "configurations:Release"
|
||||
runtime "Release"
|
||||
optimize "on"
|
1833
Navigator/vendor/glad/src/glad.c
vendored
Normal file
1833
Navigator/vendor/glad/src/glad.c
vendored
Normal file
File diff suppressed because it is too large
Load Diff
|
@ -7,6 +7,6 @@
|
|||
],
|
||||
"settings":
|
||||
{
|
||||
"SublimeLinter.linters.g++.args": ["-c","-Wall","-fsyntax-only","-std=c++17","-include${folder}/Navigator/src/navpch.h","-INavigator/src/", "-INavigator/src/Navigator/","-INavigator/vendor/spdlog/include"]
|
||||
"SublimeLinter.linters.g++.args": ["-c","-Wall","-fsyntax-only","-std=c++17","-include${folder}/Navigator/src/navpch.h","-INavigator/src/", "-INavigator/src/Navigator/","-INavigator/vendor/spdlog/include", "-INavigator/vendor/glfw/include/","-INavigator/vendor/glad/include"]
|
||||
}
|
||||
}
|
49
premake5.lua
49
premake5.lua
|
@ -13,12 +13,14 @@ outputdir = "%{cfg.buildcfg}-%{cfg.system}-%{cfg.architecture}"
|
|||
IncludeDirs ={}
|
||||
IncludeDirs["glfw"] = "Navigator/vendor/glfw/include"
|
||||
IncludeDirs["ImGui"] = "Navigator/vendor/imgui"
|
||||
IncludeDirs["glad"] = "Navigator/vendor/glad/include"
|
||||
|
||||
include "Navigator/vendor/glfw"
|
||||
include "Navigator/vendor/imgui"
|
||||
include "Navigator/vendor/glad"
|
||||
project "Navigator"
|
||||
location "Navigator"
|
||||
kind "StaticLib"
|
||||
kind "SharedLib"
|
||||
language "C++"
|
||||
cppdialect "C++17"
|
||||
staticruntime "on"
|
||||
|
@ -30,22 +32,18 @@ project "Navigator"
|
|||
pchheader "navpch.h"
|
||||
pchsource "Navigator/src/navpch.cpp"
|
||||
forceincludes {"navpch.h"}
|
||||
|
||||
filter "system:linux or macosx"
|
||||
pchheader "%{prj.name}/src/navpch.h"
|
||||
|
||||
includedirs {
|
||||
"%{prj.name}/src/",
|
||||
"%{prj.name}/src/%{prj.name}/",
|
||||
"%{prj.name}/vendor/spdlog/include/",
|
||||
"%{IncludeDirs.glfw}",
|
||||
"%{IncludeDirs.ImGui}",
|
||||
"%{IncludeDirs.glad}"
|
||||
}
|
||||
filter "system:linux or macosx"
|
||||
defines "NAV_UNIX"
|
||||
pchheader "%{prj.name}/src/navpch.h"
|
||||
includedirs {
|
||||
"%{prj.name}/vendor/spdlog/include/",
|
||||
"%{prj.name}/src/%{prj.name}/",
|
||||
"%{IncludeDirs.glfw}",
|
||||
"%{IncludeDirs.ImGui}",
|
||||
}
|
||||
|
||||
filter {}
|
||||
|
||||
files {
|
||||
|
@ -59,16 +57,37 @@ project "Navigator"
|
|||
|
||||
links {
|
||||
"GLFW",
|
||||
"ImGui",
|
||||
"opengl32.lib"
|
||||
"GLAD",
|
||||
"ImGui"
|
||||
}
|
||||
|
||||
systemversion "latest"
|
||||
|
||||
defines {
|
||||
"GLFW_INCLUDE_NONE"
|
||||
}
|
||||
|
||||
|
||||
filter "system:linux"
|
||||
defines "NAV_LINUX"
|
||||
links {
|
||||
"GL",
|
||||
"GLU",
|
||||
"glut",
|
||||
"X11",
|
||||
"dl",
|
||||
"pthread"
|
||||
}
|
||||
filter "system:macosx"
|
||||
defines "NAV_APPLE"
|
||||
links {
|
||||
"GL",
|
||||
"GLU",
|
||||
"glut",
|
||||
"X11",
|
||||
"dl",
|
||||
"pthread"
|
||||
}
|
||||
|
||||
filter "configurations:Debug"
|
||||
defines "NAV_DEBUG"
|
||||
runtime "Debug"
|
||||
|
@ -107,6 +126,8 @@ project "NavProject"
|
|||
|
||||
systemversion "latest"
|
||||
|
||||
|
||||
|
||||
filter "configurations:Debug"
|
||||
defines "NAV_DEBUG"
|
||||
runtime "Debug"
|
||||
|
|
Loading…
Reference in New Issue
Block a user