jleAssert and jleCommon header files

Mormert · Feb 18, 2024 · aca4634 · aca4634
1 parent 6a42e4f
commit aca4634
Show file tree

Hide file tree

Showing 76 changed files with 161 additions and 79 deletions.
diff --git a/engine/cAnimator.h b/engine/cAnimator.h
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include "jleBuildConfig.h"
+#include "jleCommon.h"
 
 #include "jleAnimation.h"
 #include "jleComponent.h"

diff --git a/engine/cAseprite.h b/engine/cAseprite.h
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include "jleBuildConfig.h"
+#include "jleCommon.h"
 
 #include "jleAseprite.h"
 #include "jleComponent.h"

diff --git a/engine/cCamera.h b/engine/cCamera.h
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include "jleBuildConfig.h"
+#include "jleCommon.h"
 
 #include "jleAseprite.h"
 #include "jleComponent.h"

diff --git a/engine/cCameraFPV.h b/engine/cCameraFPV.h
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include "jleBuildConfig.h"
+#include "jleCommon.h"
 
 #include "cCamera.h"
 #include "jleCamera.h"

diff --git a/engine/cLight.h b/engine/cLight.h
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include "jleBuildConfig.h"
+#include "jleCommon.h"
 
 #include "jleComponent.h"
 

diff --git a/engine/cMesh.h b/engine/cMesh.h
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include "jleBuildConfig.h"
+#include "jleCommon.h"
 
 #include "jleComponent.h"
 #include "jleMaterial.h"

diff --git a/engine/cRigidbody.cpp b/engine/cRigidbody.cpp
@@ -81,7 +81,7 @@ cRigidbody::setWorldTransform(const btTransform &centerOfMassWorldTrans)
 std::unique_ptr<btRigidBody>
 cRigidbody::createRigidbody(bool isDynamic, btCollisionShape *shape)
 {
-    btAssert((!shape || shape->getShapeType() != INVALID_SHAPE_PROXYTYPE));
+    jleAssert((!shape || shape->getShapeType() != INVALID_SHAPE_PROXYTYPE));
 
     btVector3 localInertia(0, 0, 0);
     if (isDynamic) {

diff --git a/engine/cRigidbody.h b/engine/cRigidbody.h
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include "jleBuildConfig.h"
+#include "jleCommon.h"
 
 #include "jleComponent.h"
 #include "jleMaterial.h"

diff --git a/engine/cSpriteDepth.h b/engine/cSpriteDepth.h
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include "jleBuildConfig.h"
+#include "jleCommon.h"
 
 #include "jleComponent.h"
 #include "jleTransform.h"

diff --git a/engine/cTransformNetSync.h b/engine/cTransformNetSync.h
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include "jleBuildConfig.h"
+#include "jleCommon.h"
 
 #include "jleComponent.h"
 

diff --git a/engine/cUITransformUpdater.h b/engine/cUITransformUpdater.h
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include "jleBuildConfig.h"
+#include "jleCommon.h"
 
 /*
 

diff --git a/engine/editor/jleConsoleEditorWindow.h b/engine/editor/jleConsoleEditorWindow.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "jleBuildConfig.h"
+#include "jleCommon.h"
 
 #if JLE_BUILD_EDITOR
 

diff --git a/engine/editor/jleEditorBuild.h b/engine/editor/jleEditorBuild.h
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include "jleBuildConfig.h"
+#include "jleCommon.h"
 
 #if JLE_BUILD_EDITOR
 

diff --git a/engine/editor/jleEditorGizmos.h b/engine/editor/jleEditorGizmos.h
@@ -16,7 +16,7 @@
 #ifndef JLE_EDITORGIZMOS_H
 #define JLE_EDITORGIZMOS_H
 
-#include "jleBuildConfig.h"
+#include "jleCommon.h"
 
 #if JLE_BUILD_EDITOR
 

diff --git a/engine/editor/jleEditorSaveState.h b/engine/editor/jleEditorSaveState.h
@@ -16,7 +16,7 @@
 #ifndef JLE_EDITORSAVESTATE
 #define JLE_EDITORSAVESTATE
 
-#include "jleBuildConfig.h"
+#include "jleCommon.h"
 
 #include "jleSerializedResource.h"
 #include "jleTypeReflectionUtils.h"

diff --git a/engine/editor/jleEditorTextEdit.h b/engine/editor/jleEditorTextEdit.h
@@ -16,7 +16,7 @@
 #ifndef JLEEDITORTEXTEDIT_H
 #define JLEEDITORTEXTEDIT_H
 
-#include "jleBuildConfig.h"
+#include "jleCommon.h"
 
 #if JLE_BUILD_EDITOR
 

diff --git a/engine/editor/jleGameEditorWindow.h b/engine/editor/jleGameEditorWindow.h
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include "jleBuildConfig.h"
+#include "jleCommon.h"
 
 #if JLE_BUILD_EDITOR
 

diff --git a/engine/jle3DGraph.h b/engine/jle3DGraph.h
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include "jleBuildConfig.h"
+#include "jleCommon.h"
 
 #include <glm/glm.hpp>
 

diff --git a/engine/jle3DRenderer.h b/engine/jle3DRenderer.h
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include "jleBuildConfig.h"
+#include "jleCommon.h"
 
 #include "jle3DGraph.h"
 #include "jle3DSettings.h"

diff --git a/engine/jleAnimation.cpp b/engine/jleAnimation.cpp
@@ -124,7 +124,7 @@ jleAnimation::readBonesFromMesh(const aiAnimation *animation, const aiMesh *mesh
 void
 jleAnimation::readHierarchyData(jleAnimationNode &dest, aiNode *src)
 {
-    assert(src);
+    jleAssert(src);
 
     dest.name = src->mName.C_Str();
     dest.transformation = glm::transpose(glm::make_mat4(&src->mTransformation.a1));

diff --git a/engine/jleAnimation.h b/engine/jleAnimation.h
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include "jleBuildConfig.h"
+#include "jleCommon.h"
 
 #include "jleAnimationBone.h"
 #include "jleSkinnedMesh.h"

diff --git a/engine/jleAnimationBone.h b/engine/jleAnimationBone.h
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include "jleBuildConfig.h"
+#include "jleCommon.h"
 
 #include <string>
 #include <vector>

diff --git a/engine/jleAnimationFinalMatrices.h b/engine/jleAnimationFinalMatrices.h
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include "jleBuildConfig.h"
+#include "jleCommon.h"
 
 #include <glm/glm.hpp>
 #include <vector>

diff --git a/engine/jleAssert.h b/engine/jleAssert.h
@@ -0,0 +1,55 @@
+/*********************************************************************************************
+ *                                                                                           *
+ *               ,     .     ,                      .   ,--.                                 *
+ *               |     |     |                      |   |            o                       *
+ *               | ,-. |- -- |    ,-: ,-: ,-: ,-. ,-|   |-   ;-. ,-: . ;-. ,-.               *
+ *               | |-' |     |    | | | | | | |-' | |   |    | | | | | | | |-'               *
+ *              -' `-' `-'   `--' `-` `-| `-| `-' `-'   `--' ' ' `-| ' ' ' `-'               *
+ *                                                                                           *
+ *     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~     *
+ *          Jet-Lagged Engine (jle) is licenced under GNU General Public License v3.0.       *
+ *     The licence can be found here: https://github.com/Mormert/jle/blob/master/LICENSE     *
+ *                  Copyright (c) 2020-2024 Johan Lind. All rights reserved.                 *
+ *                                                                                           *
+ *********************************************************************************************/
+
+#ifndef JLE_ASSERT_H
+#define JLE_ASSERT_H
+
+#ifndef NDEBUG
+
+#include <plog/Log.h>
+
+#ifdef _WIN32
+#include <intrin.h>
+#define JLE_DEBUG_BREAK __debugbreak()
+#else
+#include <signal.h>
+#define JLE_DEBUG_BREAK raise(SIGTRAP)
+#endif
+
+// Will only assert once, which can be convenient sometimes to avoid assertion spam
+#define jleAssertOnce(condition)                                                                                       \
+    do {                                                                                                               \
+        static bool triggeredOnce{false};                                                                              \
+        if (!(condition) && !triggeredOnce) {                                                                          \
+            triggeredOnce = true;                                                                                      \
+            LOGE << "Assertion failed: " << #condition << " at " << __FILE__ << ":" << __LINE__ << std::endl;          \
+            JLE_DEBUG_BREAK;                                                                                           \
+        }                                                                                                              \
+    } while (0)
+
+#define jleAssert(condition)                                                                                           \
+    do {                                                                                                               \
+        if (!(condition)) {                                                                                            \
+            LOGE << "Assertion failed: " << #condition << " at " << __FILE__ << ":" << __LINE__ << std::endl;          \
+            JLE_DEBUG_BREAK;                                                                                           \
+        }                                                                                                              \
+    } while (0)
+
+#else
+#define jleAssert(condition) ((void)0)
+#define jleAssertOnce(condition) ((void)0)
+#endif
+
+#endif // JLE_ASSERT_H
diff --git a/engine/jleCamera.h b/engine/jleCamera.h
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include "jleBuildConfig.h"
+#include "jleCommon.h"
 
 #include <glm/glm.hpp>
 

diff --git a/engine/jleCommandArguments.h b/engine/jleCommandArguments.h
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include "jleBuildConfig.h"
+#include "jleCommon.h"
 
 #include <string>
 #include <vector>

diff --git a/engine/jleCommon.h b/engine/jleCommon.h
@@ -0,0 +1,24 @@
+/*********************************************************************************************
+ *                                                                                           *
+ *               ,     .     ,                      .   ,--.                                 *
+ *               |     |     |                      |   |            o                       *
+ *               | ,-. |- -- |    ,-: ,-: ,-: ,-. ,-|   |-   ;-. ,-: . ;-. ,-.               *
+ *               | |-' |     |    | | | | | | |-' | |   |    | | | | | | | |-'               *
+ *              -' `-' `-'   `--' `-` `-| `-| `-' `-'   `--' ' ' `-| ' ' ' `-'               *
+ *                                                                                           *
+ *     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~     *
+ *          Jet-Lagged Engine (jle) is licenced under GNU General Public License v3.0.       *
+ *     The licence can be found here: https://github.com/Mormert/jle/blob/master/LICENSE     *
+ *                  Copyright (c) 2020-2024 Johan Lind. All rights reserved.                 *
+ *                                                                                           *
+ *********************************************************************************************/
+
+#ifndef JLE_COMMON_H
+#define JLE_COMMON_H
+
+#include "jleBuildConfig.h"
+#include "jleAssert.h"
+
+#include <plog/Log.h>
+
+#endif //JLE_COMMON_H
diff --git a/engine/jleCompileHelper.h b/engine/jleCompileHelper.h
@@ -16,7 +16,7 @@
 #ifndef JLE_COMPILE_HELPER
 #define JLE_COMPILE_HELPER
 
-#include "jleBuildConfig.h"
+#include "jleCommon.h"
 
 // These macros are used to reduce compile times by having the serialisation function from cereal
 // only be compiled once for the archives used in jle, in one .cpp file, and not spread out across multiple.

diff --git a/engine/jleComponent.h b/engine/jleComponent.h
@@ -16,7 +16,7 @@
 #ifndef JLE_COMPONENT
 #define JLE_COMPONENT
 
-#include "jleBuildConfig.h"
+#include "jleCommon.h"
 
 #include "jleTypeReflectionUtils.h"
 

diff --git a/engine/jleEngineSettings.h b/engine/jleEngineSettings.h
@@ -16,7 +16,7 @@
 #ifndef JLE_ENGINESETTINGS
 #define JLE_ENGINESETTINGS
 
-#include "jleBuildConfig.h"
+#include "jleCommon.h"
 
 #include "jleSerializedResource.h"
 #include "jleTypeReflectionUtils.h"

diff --git a/engine/jleFont.h b/engine/jleFont.h
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include "jleBuildConfig.h"
+#include "jleCommon.h"
 
 #include <glm/glm.hpp>
 #include <map>

diff --git a/engine/jleFrameBufferInterface.cpp b/engine/jleFrameBufferInterface.cpp
@@ -33,8 +33,8 @@ jleFramebufferInterface::~jleFramebufferInterface()
 void
 jleFramebufferInterface::blitToOther(jleFramebufferInterface &framebuffer, bool includeDepth)
 {
-    assert(width() == framebuffer.width());
-    assert(height() == framebuffer.height());
+    jleAssert(width() == framebuffer.width());
+    jleAssert(height() == framebuffer.height());
 
     glBindFramebuffer(GL_READ_FRAMEBUFFER, _framebuffer);
     glBindFramebuffer(GL_DRAW_FRAMEBUFFER, framebuffer._framebuffer);
@@ -80,7 +80,7 @@ unsigned int
 jleFramebufferInterface::texture() const
 {
     // Note: the framebuffer doesn't have to keep a texture!
-    assert(_texture > 0);
+    jleAssert(_texture > 0);
     return _texture;
 }
 

diff --git a/engine/jleFrameBufferInterface.h b/engine/jleFrameBufferInterface.h
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include "jleBuildConfig.h"
+#include "jleCommon.h"
 
 #include <glm/glm.hpp>
 #include <memory>

diff --git a/engine/jleFramebufferMultisample.cpp b/engine/jleFramebufferMultisample.cpp
@@ -90,7 +90,7 @@ jleFramebufferMultisample::setSamples(unsigned int samples)
 {
     int highestSamples;
     glGetIntegerv(GL_SAMPLES, &highestSamples);
-    assert(samples < highestSamples);
+    jleAssert(samples < highestSamples);
 
     _msaaSamples = samples;
     resize(_width, _height);

diff --git a/engine/jleFramebufferPicking.h b/engine/jleFramebufferPicking.h
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include "jleBuildConfig.h"
+#include "jleCommon.h"
 
 #include "jleFrameBufferInterface.h"
 

diff --git a/engine/jleFramebufferScreen.h b/engine/jleFramebufferScreen.h
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include "jleBuildConfig.h"
+#include "jleCommon.h"
 
 #include "jleFrameBufferInterface.h"