Formatting
This commit is contained in:
@@ -2,12 +2,11 @@
|
|||||||
|
|
||||||
#include <any>
|
#include <any>
|
||||||
#include <functional>
|
#include <functional>
|
||||||
#include <string>
|
|
||||||
#include <unordered_map>
|
|
||||||
|
|
||||||
#include <sophia/types.hpp>
|
#include <sophia/types.hpp>
|
||||||
#include <sophia/util/delegate.hpp>
|
#include <sophia/util/delegate.hpp>
|
||||||
#include <sophia/util/logger.hpp>
|
#include <sophia/util/logger.hpp>
|
||||||
|
#include <string>
|
||||||
|
#include <unordered_map>
|
||||||
|
|
||||||
#define BIT(x) (1 << (x))
|
#define BIT(x) (1 << (x))
|
||||||
|
|
||||||
@@ -116,7 +115,9 @@ class EventSystem {
|
|||||||
static_assert(std::is_base_of<Event, E>::value, "E must derive from Event");
|
static_assert(std::is_base_of<Event, E>::value, "E must derive from Event");
|
||||||
EventType eventType = GET_EVENT_TYPE(E);
|
EventType eventType = GET_EVENT_TYPE(E);
|
||||||
|
|
||||||
if (!this->eventDelegates.count(eventType)) { return; }
|
if (!this->eventDelegates.count(eventType)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
EventDelegate<E>& delegate =
|
EventDelegate<E>& delegate =
|
||||||
|
|||||||
@@ -12,9 +12,8 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <utility>
|
|
||||||
|
|
||||||
#include <sophia/types.hpp>
|
#include <sophia/types.hpp>
|
||||||
|
#include <utility>
|
||||||
|
|
||||||
namespace sophia::log {
|
namespace sophia::log {
|
||||||
|
|
||||||
|
|||||||
@@ -3,11 +3,10 @@
|
|||||||
#define GLFW_INCLUDE_VULKAN
|
#define GLFW_INCLUDE_VULKAN
|
||||||
#include <GLFW/glfw3.h>
|
#include <GLFW/glfw3.h>
|
||||||
|
|
||||||
#include <string>
|
|
||||||
#include <vulkan/vulkan.hpp>
|
|
||||||
|
|
||||||
#include <sophia/event.hpp>
|
#include <sophia/event.hpp>
|
||||||
#include <sophia/types.hpp>
|
#include <sophia/types.hpp>
|
||||||
|
#include <string>
|
||||||
|
#include <vulkan/vulkan.hpp>
|
||||||
|
|
||||||
namespace sophia {
|
namespace sophia {
|
||||||
|
|
||||||
@@ -35,11 +34,8 @@ class Window {
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
static void resizeCallback(GLFWwindow* window, int width, int height);
|
static void resizeCallback(GLFWwindow* window, int width, int height);
|
||||||
static void keyEventCallback(GLFWwindow* window,
|
static void keyEventCallback(GLFWwindow* window, int key, int scancode,
|
||||||
int key,
|
int action, int mods);
|
||||||
int scancode,
|
|
||||||
int action,
|
|
||||||
int mods);
|
|
||||||
void initialize();
|
void initialize();
|
||||||
|
|
||||||
int width, height;
|
int width, height;
|
||||||
|
|||||||
Reference in New Issue
Block a user