riyyi/inferno
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add asserts, update application->singleton, log defines

Browse Source
This commit is contained in:
Rick van Vonderen
2019-12-12 22:40:36 +01:00
parent e77ea7a104
commit f142030e17
7 changed files with 82 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/src/engine/application.cpp
+14 -6
View File
@@ -3,13 +3,19 @@
#include <glad/glad.h>
#include <GLFW/glfw3.h>
#include "application.h"
#include "log.h"
#include "engine/application.h"
#include "engine/core.h"
#include "engine/event/event.h"
#include "engine/log.h"
namespace Engine {
Application* Application::s_instance = nullptr;
Application::Application()
{
NF_CORE_ASSERT(!s_instance, "Application already exists!");
s_instance = this;
}
Application::~Application()
@@ -18,7 +24,9 @@ namespace Engine {
void Application::run()
{
LOG_ENGINE_LOG("Startup!");
NF_CORE_LOG("Startup!");
Event event;
glfwInit();
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4);
@@ -28,14 +36,14 @@ namespace Engine {
GLFWwindow* window = glfwCreateWindow(1280, 720, "Engine", NULL, NULL);
if (window == NULL) {
LOG_ENGINE_DANGER("Failed to create GLFW window");
NF_CORE_DANGER("Failed to create GLFW window");
glfwTerminate();
return;// -1;
}
glfwMakeContextCurrent(window);
if (!gladLoadGLLoader((GLADloadproc)glfwGetProcAddress)) {
LOG_ENGINE_DANGER("Failed to initialize GLAD");
NF_CORE_DANGER("Failed to initialize GLAD");
return;// -1;
}
@@ -56,7 +64,7 @@ namespace Engine {
glfwTerminate();
LOG_ENGINE_LOG("Shutdown!");
NF_CORE_LOG("Shutdown!");
}
}
engine/src/engine/application.h
+14 -1
View File
@@ -10,11 +10,24 @@ namespace Engine {
virtual ~Application();
void run();
inline static Application &get() { return *s_instance; }
private:
static Application* s_instance;
};
// To be defined in the game
Application *createApplication();
Application* createApplication();
}
#endif // APPLICATION_H
// @Todo
// v Application -> Singleton
// - Add assert
// - Event class
// - Event Dispatcher
// - template
// - Implement event in Application::OnEvent(Event& e);
engine/src/engine/core.h
+27
View File
@@ -0,0 +1,27 @@
#ifndef CORE_H
#define CORE_H
#include <csignal>
// Debugging defines
#ifndef NDEBUG
#define NF_ENABLE_ASSERTS
#endif
// Asserts
#ifdef NF_ENABLE_ASSERTS
// Check if SIGTRAP is available
#ifdef SIGTRAP
#define ABORT_SIGNAL SIGTRAP
#else
#define ABORT_SIGNAL SIGABRT
#endif
#define NF_ASSERT(x, y) if(!(x)) { NF_DANGER(y); raise(ABORT_SIGNAL); }
#define NF_CORE_ASSERT(x, y) if(!(x)) { NF_CORE_DANGER(y); raise(ABORT_SIGNAL); }
#else
#define NF_ASSERT(x, y)
#define NF_CORE_ASSERT(x, y)
#endif
#endif // CORE_H
engine/src/engine/entrypoint.h
+3 -2
View File
@@ -10,9 +10,9 @@
#include "application.h"
#include "log.h"
extern Engine::Application *Engine::createApplication();
extern Engine::Application* Engine::createApplication();
int main(int argc, char *argv[])
int main(int argc, char* argv[])
{
// Supress unused warning
(void)argc;
@@ -20,6 +20,7 @@ int main(int argc, char *argv[])
// Initialize Log
Engine::Log::init();
NF_CORE_INFO("Initialized Log!");
// Start application
auto app = Engine::createApplication();
engine/src/engine/log.cpp
+6 -6
View File
@@ -16,7 +16,7 @@ namespace Engine {
m_gameLogger = std::make_shared<Logger>("Game");
}
Logger::Logger(const char *name) :
Logger::Logger(const char* name) :
m_name(name)
{
}
@@ -25,27 +25,27 @@ namespace Engine {
{
}
void Logger::log(const char *message, const char *level)
void Logger::log(const char* message, const char* level)
{
printf("%s%s: %s\033[0m\n", level, m_name, message);
}
void Logger::info(const char *message)
void Logger::info(const char* message)
{
this->log(message, "\x1B[34m");
}
void Logger::warn(const char *message)
void Logger::warn(const char* message)
{
this->log(message, "\x1B[33m");
}
void Logger::danger(const char *message)
void Logger::danger(const char* message)
{
this->log(message, "\x1B[31m");
}
void Logger::success(const char *message)
void Logger::success(const char* message)
{
this->log(message, "\x1B[32m");
}
engine/src/engine/log.h
+17 -17
View File
@@ -25,31 +25,31 @@ namespace Engine {
class Logger
{
public:
Logger(const char *name);
Logger(const char* name);
~Logger();
void log(const char *message, const char *level = "");
void info(const char *message);
void warn(const char *message);
void danger(const char *message);
void success(const char *message);
void log(const char* message, const char* level = "");
void info(const char* message);
void warn(const char* message);
void danger(const char* message);
void success(const char* message);
private:
const char *m_name;
const char* m_name;
};
}
#define LOG_ENGINE_LOG(x) Engine::Log::getEngineLogger()->log(x)
#define LOG_ENGINE_INFO(x) Engine::Log::getEngineLogger()->info(x)
#define LOG_ENGINE_WARN(x) Engine::Log::getEngineLogger()->warn(x)
#define LOG_ENGINE_DANGER(x) Engine::Log::getEngineLogger()->danger(x)
#define LOG_ENGINE_SUCCESS(x) Engine::Log::getEngineLogger()->success(x)
#define NF_CORE_LOG(x) Engine::Log::getEngineLogger()->log(x)
#define NF_CORE_INFO(x) Engine::Log::getEngineLogger()->info(x)
#define NF_CORE_WARN(x) Engine::Log::getEngineLogger()->warn(x)
#define NF_CORE_DANGER(x) Engine::Log::getEngineLogger()->danger(x)
#define NF_CORE_SUCCESS(x) Engine::Log::getEngineLogger()->success(x)
#define LOG_LOG(x) Engine::Log::getGameLogger()->log(x)
#define LOG_INFO(x) Engine::Log::getGameLogger()->info(x)
#define LOG_WARN(x) Engine::Log::getGameLogger()->warn(x)
#define LOG_DANGER(x) Engine::Log::getGameLogger()->danger(x)
#define LOG_SUCCESS(x) Engine::Log::getGameLogger()->success(x)
#define NF_LOG(x) Engine::Log::getGameLogger()->log(x)
#define NF_INFO(x) Engine::Log::getGameLogger()->info(x)
#define NF_WARN(x) Engine::Log::getGameLogger()->warn(x)
#define NF_DANGER(x) Engine::Log::getGameLogger()->danger(x)
#define NF_SUCCESS(x) Engine::Log::getGameLogger()->success(x)
#endif // LOG_H
game/src/game.cpp
+1 -1
View File
@@ -7,7 +7,7 @@ public:
~Game() {};
};
Engine::Application *Engine::createApplication()
Engine::Application* Engine::createApplication()
{
return new Game();
}