gwm17/Specter
1
0
Fork 0
mirror of https://github.com/gwm17/Specter.git synced 2024-11-22 18:28:52 -05:00
Code Issues Projects Releases Wiki Activity

Finalized switch to Specter. Built successfully on windows

Browse Source
This commit is contained in:
Gordon McCann 2022-06-19 17:20:41 -04:00
parent 1b601a3fec
commit 35db3964fa
6 changed files with 5911 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Specter/src/Specter/Core/Logger.cpp
View File

@ -19,7 +19,7 @@ namespace Specter {
{ {
spdlog::set_pattern("%^[%T] %n: %v%$"); spdlog::set_pattern("%^[%T] %n: %v%$");
s_logger = spdlog::stdout_color_mt("NAV"); s_logger = spdlog::stdout_color_mt("SPEC");
s_logger->set_level(spdlog::level::trace); s_logger->set_level(spdlog::level::trace);
} }

311
Specter/vendor/glad/include/KHR/khrplatform.h vendored 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_ */

3694
Specter/vendor/glad/include/glad/glad.h vendored Normal file
View File

File diff suppressed because it is too large Load Diff

34
Specter/vendor/glad/premake5.lua vendored Normal file
View File

@ -0,0 +1,34 @@
project "Glad"
kind "StaticLib"
language "C"
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"
}
systemversion "latest"
filter "system:macosx or linux"
pic "On"
filter "system:macosx"
sysincludedirs { "include" }
filter "configurations:Debug"
runtime "Debug"
symbols "on"
filter "configurations:Release"
runtime "Release"
optimize "on"

1833
Specter/vendor/glad/src/glad.c vendored Normal file
View File

File diff suppressed because it is too large Load Diff

77
premake5.lua
View File

@ -1,29 +1,29 @@
workspace "Navigator" workspace "Specter"
architecture "x64" architecture "x64"
configurations { configurations {
"Debug", "Debug",
"Release" "Release"
} }
startproject "NavProject" startproject "SpecProject"
outputdir = "%{cfg.buildcfg}-%{cfg.system}-%{cfg.architecture}" outputdir = "%{cfg.buildcfg}-%{cfg.system}-%{cfg.architecture}"
-- External directories to be included -- External directories to be included
IncludeDirs ={} IncludeDirs ={}
IncludeDirs["glfw"] = "Navigator/vendor/glfw/include" IncludeDirs["glfw"] = "Specter/vendor/glfw/include"
IncludeDirs["ImGui"] = "Navigator/vendor/imgui" IncludeDirs["ImGui"] = "Specter/vendor/imgui"
IncludeDirs["glad"] = "Navigator/vendor/glad/include" IncludeDirs["glad"] = "Specter/vendor/glad/include"
IncludeDirs["ImPlot"] = "Navigator/vendor/implot" IncludeDirs["ImPlot"] = "Specter/vendor/implot"
IncludeDirs["glm"] = "Navigator/vendor/glm" IncludeDirs["glm"] = "Specter/vendor/glm"
IncludeDirs["asio"] = "Navigator/vendor/asio/asio/include" IncludeDirs["asio"] = "Specter/vendor/asio/asio/include"
IncludeDirs["IconFonts"] = "Navigator/vendor/IconFontCppHeaders" IncludeDirs["IconFonts"] = "Specter/vendor/IconFontCppHeaders"
include "Navigator/vendor/glfw" include "Specter/vendor/glfw"
include "Navigator/vendor/imgui" include "Specter/vendor/imgui"
include "Navigator/vendor/glad" include "Specter/vendor/glad"
project "Navigator" project "Specter"
location "Navigator" location "Specter"
kind "StaticLib" kind "StaticLib"
language "C++" language "C++"
cppdialect "C++17" cppdialect "C++17"
@ -31,15 +31,14 @@ project "Navigator"
objdir ("bin-int/" .. outputdir .. "/%{prj.name}") objdir ("bin-int/" .. outputdir .. "/%{prj.name}")
filter "system:windows" filter "system:windows"
defines "NAV_WINDOWS" defines "SPEC_WINDOWS"
pchheader "navpch.h" pchheader "specpch.h"
pchsource "Navigator/src/navpch.cpp" pchsource "Specter/src/specpch.cpp"
forceincludes {"navpch.h"} forceincludes {"specpch.h"}
filter "system:linux or macosx" filter "system:linux or macosx"
pchheader "%{prj.name}/src/navpch.h" pchheader "%{prj.name}/src/specpch.h"
filter "system:macosx" filter "system:macosx"
pchheader "src/navpch.h"
sysincludedirs { sysincludedirs {
"%{prj.name}/vendor/spdlog/include/", "%{prj.name}/vendor/spdlog/include/",
"%{IncludeDirs.glfw}", "%{IncludeDirs.glfw}",
@ -91,7 +90,7 @@ project "Navigator"
filter "system:linux" filter "system:linux"
defines "NAV_LINUX" defines "SPEC_LINUX"
links { links {
"GL", "GL",
"X11", "X11",
@ -101,7 +100,7 @@ project "Navigator"
"-pthread" "-pthread"
} }
filter "system:macosx" filter "system:macosx"
defines "NAV_APPLE" defines "SPEC_APPLE"
links { links {
"Cocoa.framework", "Cocoa.framework",
"CoreVideo.framework", "CoreVideo.framework",
@ -120,17 +119,17 @@ project "Navigator"
} }
filter "configurations:Debug" filter "configurations:Debug"
defines "NAV_DEBUG" defines "SPEC_DEBUG"
runtime "Debug" runtime "Debug"
symbols "on" symbols "on"
filter "configurations:Release" filter "configurations:Release"
defines "NAV_RELEASE" defines "SPEC_RELEASE"
runtime "Release" runtime "Release"
optimize "on" optimize "on"
project "NavProject" project "SpecProject"
location "NavProject" location "SpecProject"
kind "ConsoleApp" kind "ConsoleApp"
language "C++" language "C++"
cppdialect "C++17" cppdialect "C++17"
@ -138,14 +137,14 @@ project "NavProject"
objdir ("bin-int/" .. outputdir .. "/%{prj.name}") objdir ("bin-int/" .. outputdir .. "/%{prj.name}")
files { files {
"NavProject/src/*.h", "SpecProject/src/*.h",
"NavProject/src/*.cpp" "SpecProject/src/*.cpp"
} }
includedirs { includedirs {
"Navigator/src", "Specter/src",
"Navigator/src/Navigator", "Specter/src/Specter",
"Navigator/vendor/spdlog/include/", "Specter/vendor/spdlog/include/",
"%{IncludeDirs.ImPlot}", "%{IncludeDirs.ImPlot}",
"%{IncludeDirs.ImGui}", "%{IncludeDirs.ImGui}",
"%{IncludeDirs.glad}", "%{IncludeDirs.glad}",
@ -156,15 +155,15 @@ project "NavProject"
} }
links { links {
"Navigator" "Specter"
} }
systemversion "latest" systemversion "latest"
filter "system:macosx" filter "system:macosx"
defines "NAV_APPLE" defines "SPEC_APPLE"
sysincludedirs { sysincludedirs {
"Navigator/vendor/spdlog/include/", "Specter/vendor/spdlog/include/",
"%{IncludeDirs.glfw}", "%{IncludeDirs.glfw}",
"%{IncludeDirs.ImGui}", "%{IncludeDirs.ImGui}",
"%{IncludeDirs.glad}", "%{IncludeDirs.glad}",
@ -191,12 +190,12 @@ project "NavProject"
(" {COPYDIR} Assets %{cfg.targetdir} ") (" {COPYDIR} Assets %{cfg.targetdir} ")
} }
filter "system:windows" filter "system:windows"
defines "NAV_WINDOWS" defines "SPEC_WINDOWS"
postbuildcommands { postbuildcommands {
(" {COPYDIR} Assets %{cfg.targetdir}/Assets ") (" {COPYDIR} Assets %{cfg.targetdir}/Assets ")
} }
filter "system:linux" filter "system:linux"
defines "NAV_LINUX" defines "SPEC_LINUX"
links { links {
"GL", "GL",
"X11", "X11",
@ -215,16 +214,16 @@ project "NavProject"
filter "configurations:Debug" filter "configurations:Debug"
defines "NAV_DEBUG" defines "SPEC_DEBUG"
runtime "Debug" runtime "Debug"
symbols "on" symbols "on"
filter "configurations:Release" filter "configurations:Release"
defines "NAV_RELEASE" defines "SPEC_RELEASE"
runtime "Release" runtime "Release"
optimize "on" optimize "on"
filter "configurations:Dist" filter "configurations:Dist"
defines "NAV_DIST" defines "SPEC_DIST"
runtime "Release" runtime "Release"
optimize "on" optimize "on"