Compare commits

...

3 Commits

Author SHA1 Message Date
Jun fe62ddf7a9 Initial logging utility implementation
- Add basic Application logging
2022-09-18 16:27:33 -03:00
Jun 1d3c7217f1 Add nix/flake files 2022-09-18 16:27:33 -03:00
NaiJi ✨ 5b22f627fa JUUUUN FUCKING DO IT YEEEEE 2022-09-18 18:01:56 +03:00
8 changed files with 159 additions and 0 deletions

2
.envrc Normal file
View File

@ -0,0 +1,2 @@
use flake
watch_file shell.nix

40
flake.lock Normal file
View File

@ -0,0 +1,40 @@
{
"nodes": {
"flake-utils": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {
"id": "flake-utils",
"type": "indirect"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1663491030,
"narHash": "sha256-MVsfBhE9US5DvLtBAaTRjwYdv1tLO8xjahM8qLXTgTo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "767542707d394ff15ac1981e903e005ba69528b5",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"root": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
}
}
},
"root": "root",
"version": 7
}

14
flake.nix Normal file
View File

@ -0,0 +1,14 @@
{
description = "Project Kyoku";
outputs = { self, nixpkgs, flake-utils }:
flake-utils.lib.eachDefaultSystem
(system:
let
pkgs = nixpkgs.legacyPackages.${system};
in
{
devShell = import ./shell.nix { inherit pkgs; };
}
);
}

10
shell.nix Normal file
View File

@ -0,0 +1,10 @@
{
pkgs ? import <nixpkgs> {},
unstable ? import <nixos-unstable> {},
}:
with pkgs;
mkShell {
buildInputs = [ sfml ];
nativeBuildInputs = [ ccls cmake ];
}

View File

@ -0,0 +1,57 @@
#pragma once
#include <string>
/**
* @brief Basic logging class
*
* Defines helper functions for logging facility. Configured in Application::init()
*
*/
class Log
{
public:
enum LogLevel
{
FATAL,
ERROR,
WARN,
INFO,
DEBUG,
};
LogLevel level = WARN; ///< Default logging level
/**
* @brief Prints message to stdout
*
* TODO: write to configurable stream, be it stdout, stderr or even a file
*
* @param level the message level
* @param fmt the message format
* @param ... variable parameters
*/
void log(LogLevel level, const std::string &fmt, ...);
private:
inline std::string _getLabel(LogLevel level)
{
switch (level)
{
case DEBUG: return "DEBUG";
case INFO: return "INFO ";
case WARN: return "WARN ";
case ERROR: return "ERROR";
case FATAL: return "FATAL";
default: return "UNK ";
}
}
};
extern Log LOG; /// Global variable :(
#define INFO(fmt, ...) LOG.log(Log::INFO, fmt, ##__VA_ARGS__)
#define WARN(fmt, ...) LOG.log(Log::WARN, fmt, ##__VA_ARGS__)
#define ERROR(fmt, ...) LOG.log(Log::ERROR, fmt, ##__VA_ARGS__)
#define FATAL(fmt, ...) LOG.log(Log::FATAL, fmt, ##__VA_ARGS__)
#define DEBUG(fmt, ...) LOG.log(Log::DEBUG, fmt, ##__VA_ARGS__)

View File

@ -1,4 +1,5 @@
#include "application/application.h"
#include "application/log.h"
#include "core/gameevent.h"
#include "core/editor.h"
@ -9,8 +10,13 @@
#include "classicmode/classicfactory.h"
Log LOG;
bool Application::init()
{
LOG.level = Log::DEBUG;
DEBUG("Initializing Application");
if (!_core_factory)
return false;
@ -48,6 +54,8 @@ void Application::update(const kku::microsec& dt)
void Application::pushState(GUIState::Tag new_state)
{
DEBUG("Pushing state %d", new_state);
if (!_state_stack.empty())
_state_stack.back()->leave();
@ -57,6 +65,7 @@ void Application::pushState(GUIState::Tag new_state)
void Application::popState()
{
DEBUG("Popping state");
_state_stack.back()->leave();
_state_stack.pop_back();
_state_stack.back()->enter();

View File

@ -0,0 +1,26 @@
#include <cstdarg>
#include <iostream>
#include <vector>
#include "application/log.h"
void Log::log(LogLevel level, const std::string &fmt, ...) {
if (level > this->level)
return;
va_list args;
// First va_start: count how many characters are needed for formatting
va_start(args, fmt);
size_t len = std::vsnprintf(NULL, 0, fmt.c_str(), args);
va_end(args);
std::vector<char> buf(len + 1);
// Second va_start: actually write formatted message to buffer
va_start(args, fmt);
std::vsnprintf(&buf[0], len + 1, fmt.c_str(), args);
va_end(args);
std::cout << this->_getLabel(level) << " " << &buf[0] << std::endl;
}

View File

@ -2,6 +2,7 @@
#include <vector>
#include <algorithm>
#include <functional>
template <class T>
class SelectionManager