Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/engine/logging/log.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include <string>
#include <string_view>

namespace log {
namespace logging {

// Pattern: time | level | thread | logger | msg
static constexpr const char *kPattern =
Expand Down Expand Up @@ -88,4 +88,4 @@ std::shared_ptr<spdlog::logger> get(std::string_view name) {
return logger;
}

} // namespace log
} // namespace logging
6 changes: 3 additions & 3 deletions src/engine/logging/log.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
#include <spdlog/logger.h>
#include <string_view>

namespace log {
namespace logging {

void init();
void shutdown();

std::shared_ptr<spdlog::logger> &engine();
std::shared_ptr<spdlog::logger> get(std::string_view name);
} // namespace log
} // namespace logging

#define LOG_TU_LOGGER() (::log::engine())
#define LOG_TU_LOGGER() (::logging::engine())

#define LOGT(...) (LOG_TU_LOGGER())->trace(__VA_ARGS__)
#define LOGD(...) (LOG_TU_LOGGER())->debug(__VA_ARGS__)
Expand Down
2 changes: 1 addition & 1 deletion src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ static void pushCubeGrid(std::vector<DrawItem> &out, MeshHandle mesh,
}

int main() {
log::init();
logging::init();
LOGI("Engine starting...");

EngineApp app;
Expand Down
2 changes: 1 addition & 1 deletion src/render/resources/material_system.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
#include <glm/ext/vector_float3.hpp>
#include <glm/ext/vector_float4.hpp>
#include <optional>
#include <string>
#include <vector>
#include <vulkan/vulkan_core.h>

struct TextureHandle {
uint32_t id = UINT32_MAX;

Expand Down