josh/JGL
1
0
Fork 1
Code Issues 14 Pull Requests Actions Packages Projects Releases 58 Wiki Activity

Make logging fit to standard
Some checks failed
Run ReCI Build Test / Explore-Gitea-Actions (push) Failing after 2m7s
Details

Browse Source
This commit is contained in:
maxine
2024-09-17 23:17:19 -04:00
parent 41fa634da1
commit 58e432b9c3
5 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/JGL/JGL.h
View File

@@ -25,7 +25,7 @@
#include <J3ML/Geometry/Sphere.hpp>
#include <J3ML/Geometry/Capsule.hpp>
#include <J3ML/Geometry/Triangle2D.hpp>
#include <JGL/Logger.h>
#include "JGL/logger/logger.hpp"
/// OpenGL Wrapper for rendering 2D & 3D graphics in both a 2D and 3D context.
namespace JGL {

3
include/JGL/Logger.h → include/JGL/logger/logger.hpp
View File

@@ -1,6 +1,6 @@
#pragma once
#include <jlog/Logger.hpp>
#include "jlog/Logger.hpp"
namespace JGL::Logger {
using namespace jlog;
@@ -8,4 +8,5 @@ namespace JGL::Logger {
extern GenericLogger Fatal;
extern GenericLogger Debug;
extern GenericLogger Error;
}

41
src/JGL.cpp
View File

@@ -4,7 +4,6 @@
#include <JGL/JGL.h>
#include <glad/glad.h>
#include <jlog/Logger.hpp>
#include <J3ML/Algorithm/Bezier.hpp>
JGL::RenderTarget* render_target = nullptr;
@@ -114,7 +113,7 @@ namespace JGL {
if (!inJ3D)
inJ2D = true;
else { jlog::Error("Attempt to Begin J2D inside of J3D context."); }
else { JGL::Logger::Error("Attempt to Begin J2D inside of J3D context."); }
if (rt != nullptr && clear_buffers) {
glClearColor(rt->GetClearColor().R(), rt->GetClearColor().G(), rt->GetClearColor().B(), rt->GetClearColor().A());
@@ -166,7 +165,7 @@ namespace JGL {
void J2D::DrawPoint(const Color4& color, const Vector2& coordinates, float radius) {
if (!inJ2D)
jlog::Error("Drawing J2D element before J2D begin.");
JGL::Logger::Error("Drawing J2D element before J2D begin.");
Vector2 vertices[] = {coordinates};
@@ -183,7 +182,7 @@ namespace JGL {
void J2D::DrawLine(const Color4& color, const Vector2& A, const Vector2& B, float thickness) {
if (!inJ2D)
jlog::Error("Drawing J2D element before J2D begin.");
JGL::Logger::Error("Drawing J2D element before J2D begin.");
Vector2 vertices[] = {A, B};
glLineWidth(thickness);
@@ -199,7 +198,7 @@ namespace JGL {
void J2D::DrawGradientLine(const Color4& color1, const Color4& color2, const Vector2& A, const Vector2& B, float thickness) {
if (!inJ2D)
jlog::Error("Drawing J2D element before J2D begin.");
JGL::Logger::Error("Drawing J2D element before J2D begin.");
Vector2 vertices[] = {A, B};
GLfloat colors[8] = {color1.RedChannelNormalized(), color1.GreenChannelNormalized(), color1.BlueChannelNormalized(), color1.AlphaChannelNormalized(),
@@ -220,7 +219,7 @@ namespace JGL {
void J2D::OutlineRect(const Color4& color, const Vector2& pos, const Vector2& size, float thickness) {
if (!inJ2D)
jlog::Error("Drawing J2D element before J2D begin.");
JGL::Logger::Error("Drawing J2D element before J2D begin.");
Vector2 vertices[] = {{pos.x, pos.y}, {pos.x, pos.y + size.y}, {pos.x + size.x, pos.y + size.y}, {pos.x + size.x, pos.y}};
@@ -233,7 +232,7 @@ namespace JGL {
void J2D::FillRect(const Color4& color, const Vector2& pos, const Vector2& size) {
if (!inJ2D)
jlog::Error("Drawing J2D element before J2D begin.");
JGL::Logger::Error("Drawing J2D element before J2D begin.");
Vector2 vertices[] = {{pos.x, pos.y}, {pos.x, pos.y + size.y}, {pos.x + size.x, pos.y + size.y}, {pos.x + size.x, pos.y}};
glColor4ubv(color.ptr());
@@ -244,7 +243,7 @@ namespace JGL {
void J2D::FillGradientRect(const Color4& color1, const Color4& color2, const Direction& gradient, const Vector2& pos, const Vector2& size) {
if (!inJ2D)
jlog::Error("Drawing J2D element before J2D begin.");
JGL::Logger::Error("Drawing J2D element before J2D begin.");
Vector2 vertices[] = {{pos.x, pos.y}, {pos.x, pos.y + size.y}, {pos.x + size.x, pos.y + size.y}, {pos.x + size.x, pos.y}};
std::vector<GLfloat> colors{};
@@ -277,7 +276,7 @@ namespace JGL {
void J2D::FillRoundedRect(const Color4& color, const Vector2& pos, const Vector2& size, float radius, unsigned int subdivisions) {
if (!inJ2D)
jlog::Error("Drawing J2D element before J2D begin.");
JGL::Logger::Error("Drawing J2D element before J2D begin.");
J2D::FillRect(color, {pos.x + radius, pos.y}, {size.x - 2 * radius, size.y});
J2D::FillRect(color, {pos.x, pos.y + radius}, {size.x, size.y - 2 * radius});
@@ -310,7 +309,7 @@ namespace JGL {
void J2D::DrawSprite(const Texture& texture, const Vector2& pos, float rad_rotation, const Vector2& origin,
const Vector2& scale, const Color4& color, Direction inversion) {
if (!inJ2D)
jlog::Error("Drawing J2D element before J2D begin.");
JGL::Logger::Error("Drawing J2D element before J2D begin.");
const Vector2 size = texture.GetDimensions();
@@ -376,7 +375,7 @@ namespace JGL {
const Vector2& sub_texture_size, float rad_rotation, const Vector2& origin,
const Vector2& scale, const Color4& color, Direction inversion) {
if (!inJ2D)
jlog::Error("Drawing J2D element before J2D begin.");
JGL::Logger::Error("Drawing J2D element before J2D begin.");
const Vector2 textureSize = texture.GetDimensions();
@@ -445,10 +444,10 @@ namespace JGL {
void J2D::DrawMirrorSprite(const Texture& texture, const Vector2& position, Direction mirror_axis, float rad_rotation, const Vector2& origin, const Vector2& scale, const Color4& color) {
if (!inJ2D)
jlog::Error("Drawing J2D element before J2D begin.");
JGL::Logger::Error("Drawing J2D element before J2D begin.");
if (mirror_axis == Direction::None)
jlog::Warning("Drawing non-mirrored sprite with J2D::DrawMirrorSprite?");
JGL::Logger::Warning("Drawing non-mirrored sprite with J2D::DrawMirrorSprite?");
glBindTexture(GL_TEXTURE_2D, texture.GetGLTextureHandle());
Vector2 size = texture.GetDimensions();
@@ -510,7 +509,7 @@ namespace JGL {
void J2D::OutlineCircle(const Color4& color, const Vector2& center, float radius, unsigned int subdivisions, float thickness) {
if (!inJ2D)
jlog::Error("Drawing J2D element before J2D begin.");
JGL::Logger::Error("Drawing J2D element before J2D begin.");
float step = (2.f * Math::Pi) / (float) subdivisions;
std::vector<Vector2> vertices{};
@@ -531,7 +530,7 @@ namespace JGL {
void J2D::FillCircle(const Color4& color, const Vector2& center, float radius, unsigned int subdivisions) {
if (!inJ2D)
jlog::Error("Drawing J2D element before J2D begin.");
JGL::Logger::Error("Drawing J2D element before J2D begin.");
GLfloat angle, x, y;
float step = (2.f * Math::Pi) / (float) subdivisions;
@@ -548,7 +547,7 @@ namespace JGL {
void J2D::OutlineTriangle(const Color4& color, const Triangle2D& tri, float thickness) {
if (!inJ2D)
jlog::Error("Drawing J2D element before J2D begin.");
JGL::Logger::Error("Drawing J2D element before J2D begin.");
Vector2 vertices[] = {{tri.A.x, tri.A.y}, {tri.B.x, tri.B.y}, {tri.C.x, tri.C.y}};
@@ -561,7 +560,7 @@ namespace JGL {
void J2D::FillTriangle(const Color4& color, const Triangle2D& tri) {
if (!inJ2D)
jlog::Error("Drawing J2D element before J2D begin.");
JGL::Logger::Error("Drawing J2D element before J2D begin.");
Vector2 vertices[] = {{tri.A.x, tri.A.y}, {tri.B.x, tri.B.y}, {tri.C.x, tri.C.y}};
@@ -573,7 +572,7 @@ namespace JGL {
void J2D::FillGradientTriangle(const Color4& a_color, const Color4& b_color, const Color4& c_color, const Triangle2D& tri) {
if (!inJ2D)
jlog::Error("Drawing J2D element before J2D begin.");
JGL::Logger::Error("Drawing J2D element before J2D begin.");
Vector2 vertices[] = {{tri.A.x, tri.A.y}, {tri.B.x, tri.B.y}, {tri.C.x, tri.C.y}};
GLfloat colors[] = {a_color.RedChannelNormalized(), a_color.GreenChannelNormalized(), a_color.BlueChannelNormalized(), a_color.AlphaChannelNormalized(),
@@ -608,7 +607,7 @@ namespace JGL {
void J2D::OutlinePolygon(const Color4 &color, const std::vector<Vector2>& points, float thickness) {
if (!inJ2D)
jlog::Error("Drawing J2D element before J2D begin.");
JGL::Logger::Error("Drawing J2D element before J2D begin.");
if (points.front() != points.back())
throw std::runtime_error("J2D::OutlinePolygon: The first point and the last point must connect.");
@@ -704,7 +703,7 @@ namespace JGL {
if (!inJ2D)
inJ3D = true;
else
jlog::Error("Can't begin J3D context inside J2D context.");
JGL::Logger::Error("Can't begin J3D context inside J2D context.");
}
void J3D::End() {
@@ -733,7 +732,7 @@ namespace JGL {
void J3D::DrawLine(const Color4& color, const Vector3& A, const Vector3& B, float thickness) {
if (!inJ3D)
jlog::Error("Attempt to Render J3D element before J3D begin.");
JGL::Logger::Error("Attempt to Render J3D element before J3D begin.");
Vector3 vertices[] = {A, B};

2
src/TextRendering.cpp
View File

@@ -15,7 +15,7 @@
#include <JGL/types/Font.h>
#include <JGL/types/FontCache.h>
#include <JGL/Logger.h>
#include "JGL/logger/logger.hpp"
namespace JGL {
CachedFont* CacheFont(const Font& font, u32 size) {

9
src/logger/logger.cpp Normal file
View File

@@ -0,0 +1,9 @@
#include "JGL/logger/logger.hpp"
namespace ReWindow::Logger {
using namespace jlog;
GenericLogger Fatal {"JGL::fatal", GlobalLogFile, Colors::Reds::Crimson, Colors::Gray, Colors::Gray, Colors::Reds::Crimson, Colors::White};
GenericLogger Debug {"JGL::debug", GlobalLogFile, Colors::Purples::Purple, Colors::Gray, Colors::Gray, Colors::Purples::Purple, Colors::White};
GenericLogger Error {"JGL::error", GlobalLogFile, Colors::Red, Colors::Gray, Colors::Gray, Colors::Red, Colors::White};
}