Adds beginnings of the style guide

Refactors file and folder names to conform to the style guide

CMakeLists.txt

@@ -63,10 +63,10 @@ set(LUNARIUM_SRC
 "src/utils/stb/stb_image_write.cpp"
 "src/utils/stb/stb_image.cpp" 
 "src/utils/args.cpp" 
-"src/utils/binaryFileBuffer.cpp"
+"src/utils/binary_file_buffer.cpp"
-"src/utils/frameCounter.cpp" 
+"src/utils/frame_counter.cpp" 
 "src/utils/helpers.cpp" 
-"src/utils/highResTimer.cpp" 
+"src/utils/high_resolution_timer.cpp" 
 "src/utils/logger.cpp" 
 "src/utils/op_res.cpp"
 "src/platform/window.cpp"
@@ -74,11 +74,11 @@ set(LUNARIUM_SRC
 "src/graphics/opengl/glGraphics.cpp"
 "src/graphics/opengl/glText.cpp"
 "src/graphics/opengl/glShader.cpp"
-"src/graphics/internalFont.cpp"
+"src/internal_data/internal_font.cpp"
-"src/internal_data/dataManager.cpp"
+"src/internal_data/data_manager.cpp"
 "src/input/keyboard.cpp"
-"src/input/inputManager.cpp"
+"src/input/input_manager.cpp"
-"src/scripting/scriptManager.cpp"
+"src/scripting/script_manager.cpp"
 "src/scripting/coreAPI.cpp"
 )
 

docs/design/style_guide.txt

@@ -0,0 +1,10 @@
+
+
+file and folder names should be all lower-case using underscores to separate words (snake case) (ex: run_mode.h, simple_render_scene.cpp)
+All variables should be snake case (lower-case with underscores to separate words)
+All method names should be pascal case (no underscores and each word capitalized ex: GetUserName())
+All class and struct names should be pascal case (no underscores and each word capitalized ex: GetUserName())
+
+All methods should be defined in a .cpp (no inline methods in headers)
+Class member variables should start with m (ex: mUserName)
+Struct member variables should NOT start with m (ex: UserName)

src/core/core.cpp

@@ -22,12 +22,12 @@
 
 // Sub Systems
 #include <platform/window.h>
-#include <input/inputManager.h>
+#include <input/input_manager.h>
 #include <graphics/opengl/glGraphics.h>
 #include <gui/gui.h>
 // #include <gui/logGui.h>
 // #include <gui/luaConsole.h>
-#include <scripting/scriptManager.h>
+#include <scripting/script_manager.h>
 #include <scripting/coreAPI.h>
 
 namespace lunarium

src/core/core.h

@@ -16,7 +16,7 @@
 #include <gui/panel_defs.h>
 #include <utils/logger.h>
 #include <utils/args.h>
-#include <utils/frameCounter.h>
+#include <utils/frame_counter.h>
 
 namespace lunarium
 {

src/core/run_mode.h

@@ -10,7 +10,7 @@
 #define RUN_MODE_H_
 
 #include <utils/op_res.h>
-#include <input/inputManager.h>
+#include <input/input_manager.h>
 #include <input/keyboard.h>
 
 namespace lunarium

src/graphics/opengl/glGraphics.cpp

@@ -10,7 +10,7 @@
 #include "defaultShaders.h"
 #include <platform/window.h>
 #include <assets/types/image.h>
-#include "../openFontData.h"
+#include <internal_data/data_headers/open_font.h>
 #include <utils/logger.h>
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtc/type_ptr.hpp>
@@ -32,7 +32,7 @@ namespace lunarium
 		
 		if (type == GL_DEBUG_TYPE_ERROR)
 		{
-			Logger::GIInfo(LogCategory::GRAPHICS,
+			Logger::GIError(LogCategory::GRAPHICS,
 			"%s (type: %s, source: %s, severity: %s), message: %s",
 			(type == GL_DEBUG_TYPE_ERROR ? "** GL ERROR **" : ""),
 			OglGraphics::mDebugMsgSources[source].c_str(),

src/input/input_manager.cpp

@@ -9,7 +9,7 @@
 ******************************************************************************/
 
 #include <platform/window.h>
-#include "inputManager.h"
+#include "input_manager.h"
 #include <gui/gui.h>
 #include <utils/logger.h>
 #include <cstring>

src/input/input_manager.h

@@ -1,6 +1,6 @@
 
 /******************************************************************************
-*	File		-	InputManager.h
+*	File		-	input_manager.h
 *	Author		-	Joey Pollack
 *	Date		-	2019/11/14 (y/m/d)
 *	Mod Date	-	2021/09/08 (y/m/d)

src/input/keyboard.h

@@ -14,7 +14,7 @@
 #include <map>
 #include <string>
 
-#include <platform/keyCodes.h>
+#include <platform/key_codes.h>
 
 namespace lunarium
 {

src/internal_data/data_manager.cpp

@@ -7,7 +7,7 @@
 *                   UI sounds etc..
 ******************************************************************************/
 
-#include "dataManager.h"
+#include "data_manager.h"
 
 #include <core/core.h>
 #include <graphics/graphics.h>

src/internal_data/data_manager.h

@@ -1,5 +1,5 @@
 /******************************************************************************
-*	File		-	dataManager.h
+*	File		-	data_manager.h
 *	Author		-	Joey Pollack
 *	Date		-	2021/12/01 (y/m/d)
 *	Mod Date	-	2021/12/01 (y/m/d)

src/internal_data/internal_font.cpp

@@ -1,5 +1,5 @@
 /******************************************************************************
-*	File		-	InternalFont.h
+*	File		-	Internal_font.h
 *	Author		-	Joey Pollack
 *	Date		-	2020/01/08 (y/m/d)
 *	Mod Date	-	2021/09/07 (y/m/d)
@@ -7,9 +7,9 @@
 *
 ******************************************************************************/
 
-#include "internalFont.h"
+#include "internal_font.h"
-#include "openFontData.h"
+#include "data_headers/open_font.h"
-#include "robotoFontData.h"
+#include "data_headers/roboto_font.h"
 #include <utils/logger.h>
 #include <fstream>
 

src/internal_data/internal_font.h

@@ -1,5 +1,5 @@
 /******************************************************************************
-*	File		-	InternalFont.h
+*	File		-	internal_font.h
 *	Author		-	Joey Pollack
 *	Date		-	2020/01/08 (y/m/d)
 *	Mod Date	-	2020/01/08 (y/m/d)

src/internal_libs/assets/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_library(assets assetManager.cpp types/asset.cpp types/image.cpp loaders/assetIndex.cpp)
+add_library(assets asset_manager.cpp types/asset.cpp types/image.cpp loaders/asset_index.cpp)
 
 # add utils
 target_link_directories(assets 

src/internal_libs/assets/asset_manager.h

@@ -1,5 +1,5 @@
 /******************************************************************************
-*	File		-	assetManager.h
+*	File		-	asset_manager.h
 *	Author		-	Joey Pollack
 *	Date		-	2021/10/25 (y/m/d)
 *	Mod Date	-	2021/10/25 (y/m/d)
@@ -9,6 +9,8 @@
 #ifndef ASSET_MANAGER_H_
 #define ASSET_MANAGER_H_
 
+#include <utils/op_res.h>
+
 #include <vector>
 #include <map>
 #include <string>

src/internal_libs/assets/definitions.h

@@ -1,23 +0,0 @@
-/******************************************************************************
-*	File		-	definitions.h
-*	Author		-	Joey Pollack
-*	Date		-	2021/09/14 (y/m/d)
-*	Mod Date	-	2021/09/14 (y/m/d)
-*	Description	-	Common graphics definitions 
-******************************************************************************/
-
-#ifndef ASSETS_DEFINITIONS_H_
-#define ASSETS_DEFINITIONS_H_
-
-namespace lunarium
-{
-    enum ImageFormat
-	{
-		RGB,
-		RGBA,
-		BGR,
-		BGRA
-	};
-}
-
-#endif     // ASSETS_DEFINITIONS_H_

src/internal_libs/assets/loaders/asset_index.cpp

@@ -1,5 +1,5 @@
 /******************************************************************************
-*	File		-	assetIndex.h
+*	File		-	asset_index.h
 *	Author		-	Joey Pollack
 *	Date		-	2021/10/25 (y/m/d)
 *	Mod Date	-	2021/10/25 (y/m/d)
@@ -7,8 +7,8 @@
 *                   the asset index by asset ID or name.
 ******************************************************************************/
 
-#include "assetIndex.h"
+#include "asset_index.h"
-#include <utils/binaryFileBuffer.h>
+#include <utils/binary_file_buffer.h>
 
 namespace lunarium
 {

src/internal_libs/assets/loaders/asset_index.h

@@ -1,5 +1,5 @@
 /******************************************************************************
-*	File		-	assetIndex.h
+*	File		-	asset_index.h
 *	Author		-	Joey Pollack
 *	Date		-	2021/10/25 (y/m/d)
 *	Mod Date	-	2021/10/25 (y/m/d)
@@ -10,11 +10,13 @@
 #ifndef ASSET_INDEX_H_
 #define ASSET_INDEX_H_
 
+#include <core/common_defs.h>
+#include <core/types.h>
+#include <utils/op_res.h>
+#include <assets/types/asset.h>
+
 #include <string>
 #include <map>
-#include <assets/types/asset.h>
-#include <utils/op_res.h>
-#include <core/types.h>
 
 namespace lunarium
 {
@@ -26,8 +28,8 @@ namespace lunarium
             int32_t ID;
             std::string Name;
             AssetType Type;
-            std::string File;
+            std::string File;       // The data file the asset is stored in
-            int32_t Offset;
+            u32 Offset;             // The offset into the file at which the asset can be found
         };
 
     public:

src/internal_libs/assets/types/image.h

@@ -10,11 +10,19 @@
 #ifndef IMAGE_H_
 #define IMAGE_H_
 
-#include <assets/definitions.h>
 #include "asset.h"
 
 namespace lunarium
 {
+
+	enum ImageFormat
+	{
+		RGB,
+		RGBA,
+		BGR,
+		BGRA
+	};
+
 	class Image : public Asset
 	{
 	public:

src/internal_libs/gui/console.cpp

@@ -10,7 +10,7 @@
 #include "console.h"
 #include <gui/dearimgui/imgui.h>
 #include <core/core.h>
-#include <input/inputManager.h>
+#include <input/input_manager.h>
 #include <cstring>
 #include <sstream>
 #include <iostream>
@@ -103,8 +103,8 @@ namespace lunarium
 
          for (int i = 0; i < mMsgHistory.size(); i++)
         {
-            if ((mMsgHistory[i].find("[OGL_DEBUG]") != std::string::npos && !mbOglDebug)
+            if ((mMsgHistory[i].find("[GRAPHICS_INTERNAL_DEBUG]") != std::string::npos && !mbOglDebug)
-            || (mMsgHistory[i].find("[INFO_VERBOSE]") != std::string::npos && !mbInfoVerbose))
+            || (mMsgHistory[i].find("[TRACE]") != std::string::npos && !mbInfoVerbose))
             {
                 continue;
             }

src/internal_libs/gui/file_browser.cpp

@@ -14,7 +14,7 @@
 #include <core/core.h>
 #include <assets/types/image.h>
 #include <graphics/graphics.h>
-#include <internal_data/dataManager.h>
+#include <internal_data/data_manager.h>
 #include <utils/stb/stb_image.h>
 #include "dearimgui/imgui.h"
 

src/internal_libs/gui/gui.cpp

@@ -14,7 +14,7 @@
 #include "dearimgui/imgui.h"
 #include "dearimgui/imgui_impl_glfw.h"
 #include "dearimgui/imgui_impl_opengl3.h"
-#include <graphics/internalFont.h>
+#include <internal_data/internal_font.h>
 
 namespace lunarium
 {

src/internal_libs/gui/luaConsole.cpp

@@ -8,7 +8,7 @@
 
 #include "luaConsole.h"
 #include <core/core.h>
-#include <input/inputManager.h>
+#include <input/input_manager.h>
 #include <window/window.h>
 #include <imgui.h>
 #include <imgui_impl_glfw.h>

src/platform/key_codes.h

@@ -1,5 +1,5 @@
 /******************************************************************************
-*	File		-	KeyCodes.h
+*	File		-	key_codes.h
 *	Author		-	Joey Pollack
 *	Date		-	2019/11/14 (y/m/d)
 *	Mod Date	-	2021/09/08 (y/m/d)

src/run_modes/editor/CMakeLists.txt

@@ -6,10 +6,10 @@ set(EDITOR_SRC
 "panel_manager.cpp"
 "project.cpp" 
 "panels/about.cpp"
-"panels/assetBrowser.cpp"
+"panels/asset_browser.cpp"
-"panels/worldTree.cpp"
+"panels/world_tree.cpp"
-"panels/worldView.cpp"
+"panels/world_view.cpp"
-"panels/propertiesView.cpp"
+"panels/properties_view.cpp"
 "contents/content_manager.cpp"
 "contents/editor_asset.cpp"
 "contents/tile_map.cpp"

src/run_modes/editor/editor.cpp

@@ -12,15 +12,15 @@
 #include <core/core.h>
 #include <core/version.h>
 #include <utils/logger.h>
-#include <internal_data/dataManager.h>
+#include <internal_data/data_manager.h>
 #include <gui/gui.h>
 #include <gui/dearimgui/imgui.h>
 
 // Panels
-#include "panels/worldTree.h"
+#include "panels/world_tree.h"
-#include "panels/worldView.h"
+#include "panels/world_view.h"
-#include "panels/propertiesView.h"
+#include "panels/properties_view.h"
-#include "panels/assetBrowser.h"
+#include "panels/asset_browser.h"
 
 // Tools
 #include "tools/map_editor/map_editor.h"

src/run_modes/editor/panel_manager.cpp

@@ -14,10 +14,10 @@
 
 // Panels
 #include "panels/about.h"
-#include "panels/assetBrowser.h"
+#include "panels/asset_browser.h"
-#include "panels/worldTree.h"
+#include "panels/world_tree.h"
-#include "panels/worldView.h"
+#include "panels/world_view.h"
-#include "panels/propertiesView.h"
+#include "panels/properties_view.h"
 
 using namespace lunarium::gui;
 

src/run_modes/editor/panels/asset_browser.cpp

@@ -6,7 +6,7 @@
 *	Description	-	Browse and manage project assets
 ******************************************************************************/
 
-#include "assetBrowser.h"
+#include "asset_browser.h"
 #include <gui/dearimgui/imgui.h>
 #include <editor/editor.h>
 

src/run_modes/editor/panels/asset_browser.h

@@ -1,5 +1,5 @@
 /******************************************************************************
-*	File		-	assetBrowser.h
+*	File		-	asset_browser.h
 *	Author		-	Joey Pollack
 *	Date		-	2021/11/10 (y/m/d)
 *	Mod Date	-	2021/11/10 (y/m/d)

src/run_modes/editor/panels/properties_view.cpp

@@ -1,5 +1,5 @@
 /******************************************************************************
-*	File		-	propertiesView.h
+*	File		-	properties_view.h
 *	Author		-	Joey Pollack
 *	Date		-	2022/01/26 (y/m/d)
 *	Mod Date	-	2022/01/26 (y/m/d)
@@ -7,7 +7,7 @@
 *                   object.
 ******************************************************************************/
 
-#include "propertiesView.h"
+#include "properties_view.h"
 #include <gui/dearimgui/imgui.h>
 #include <editor/editor.h>
 

src/run_modes/editor/panels/properties_view.h

@@ -1,5 +1,5 @@
 /******************************************************************************
-*	File		-	propertiesView.h
+*	File		-	properties_view.h
 *	Author		-	Joey Pollack
 *	Date		-	2022/01/26 (y/m/d)
 *	Mod Date	-	2022/01/26 (y/m/d)

src/run_modes/editor/panels/world_tree.cpp

@@ -6,7 +6,7 @@
 *	Description	-	The tree view listing all objects in the world
 ******************************************************************************/
 
-#include "worldTree.h"
+#include "world_tree.h"
 #include <game/world/world.h>
 #include <gui/dearimgui/imgui.h>
 #include <editor/editor.h>

src/run_modes/editor/panels/world_tree.h

@@ -1,5 +1,5 @@
 /******************************************************************************
-*	File		-	worldTree.h
+*	File		-	world_tree.h
 *	Author		-	Joey Pollack
 *	Date		-	2021/11/04 (y/m/d)
 *	Mod Date	-	2021/11/04 (y/m/d)

src/run_modes/editor/panels/world_view.cpp

@@ -6,7 +6,7 @@
 *	Description	-	A rendered view of the world
 ******************************************************************************/
 
-#include "worldView.h"
+#include "world_view.h"
 #include <utils/logger.h>
 #include <game/world/world.h>
 #include <gui/dearimgui/imgui.h>

src/run_modes/editor/panels/world_view.h

@@ -1,5 +1,5 @@
 /******************************************************************************
-*	File		-	worldView.h
+*	File		-	world_view.h
 *	Author		-	Joey Pollack
 *	Date		-	2022/01/26 (y/m/d)
 *	Mod Date	-	2022/01/26 (y/m/d)

src/run_modes/editor/tools/map_editor/panels/tile_set_view.h

@@ -11,7 +11,7 @@
 
 #include <gui/panel.h>
 #include <core/types.h>
-#include <utils/highResTimer.h>
+#include <utils/high_resolution_timer.h>
 #include <map>
 
 namespace lunarium { class Image; }

src/run_modes/testbed/CMakeLists.txt

@@ -1,6 +1,6 @@
 
 
-add_library(testbed testbed.cpp scenes/baseScene.cpp scenes/simpleRenderScene.cpp scenes/physicsScene.cpp)
+add_library(testbed testbed.cpp scenes/base_scene.cpp scenes/simple_render_scene.cpp scenes/physics_scene.cpp)
 
 target_include_directories(testbed
     PUBLIC "${PROJECT_BINARY_DIR}"

src/run_modes/testbed/scenes/base_scene.cpp

@@ -6,7 +6,7 @@
 *	Description	-	The interface class for tester scenes
 ******************************************************************************/
 
-#include "baseScene.h"
+#include "base_scene.h"
 
 namespace lunarium
 {

src/run_modes/testbed/scenes/base_scene.h

@@ -1,5 +1,5 @@
 /******************************************************************************
-*	File		-	baseScene.h
+*	File		-	base_scene.h
 *	Author		-	Joey Pollack
 *	Date		-	2021/10/27 (y/m/d)
 *	Mod Date	-	2021/10/27 (y/m/d)
@@ -9,7 +9,7 @@
 #ifndef BASE_SCENE_H_
 #define BASE_SCENE_H_
 
-#include <input/inputManager.h>
+#include <input/input_manager.h>
 #include <input/keyboard.h>
 
 namespace lunarium

src/run_modes/testbed/scenes/physics_scene.cpp

@@ -1,12 +1,12 @@
 /******************************************************************************
-*	File		-	physicsScene.h
+*	File		-	physics_scene.h
 *	Author		-	Joey Pollack
 *	Date		-	2021/10/27 (y/m/d)
 *	Mod Date	-	2021/10/27 (y/m/d)
 *	Description	-	Displays a scene that tests the Box2D physics system
 ******************************************************************************/
 
-#include "physicsScene.h"
+#include "physics_scene.h"
 #include <core/core.h>
 #include <graphics/graphics.h>
 #include <utils/logger.h>

src/run_modes/testbed/scenes/physics_scene.h

@@ -1,5 +1,5 @@
 /******************************************************************************
-*	File		-	physicsScene.h
+*	File		-	physics_scene.h
 *	Author		-	Joey Pollack
 *	Date		-	2021/10/27 (y/m/d)
 *	Mod Date	-	2021/10/27 (y/m/d)
@@ -9,7 +9,7 @@
 #ifndef PHYSICS_SCENE_H_
 #define PHYSICS_SCENE_H_
 
-#include "baseScene.h"
+#include "base_scene.h"
 #include <box2d/box2d.h>
 
 namespace lunarium

src/run_modes/testbed/scenes/simple_render_scene.cpp

@@ -1,17 +1,17 @@
 /******************************************************************************
-*	File		-	simpleRenderScene.cpp
+*	File		-	simple_render_scene.cpp
 *	Author		-	Joey Pollack
 *	Date		-	2021/10/27 (y/m/d)
 *	Mod Date	-	2021/10/27 (y/m/d)
 *	Description	-	Displays a simple scene that tests basic render features.
 ******************************************************************************/
 
-#include "simpleRenderScene.h"
+#include "simple_render_scene.h"
 #include <core/core.h>
 #include <utils/helpers.h>
 #include <utils/logger.h>
 #include <graphics/graphics.h>
-#include <input/inputManager.h>
+#include <input/input_manager.h>
 #include <assets/types/image.h>
 #include <utils/stb/std_image_write.h>
 #include <utils/stb/stb_image.h>

src/run_modes/testbed/scenes/simple_render_scene.h

@@ -1,5 +1,5 @@
 /******************************************************************************
-*	File		-	simpleRenderScene.h
+*	File		-	simple_render_scene.h
 *	Author		-	Joey Pollack
 *	Date		-	2021/10/27 (y/m/d)
 *	Mod Date	-	2021/10/27 (y/m/d)
@@ -9,7 +9,7 @@
 #ifndef SIMPLE_RENDER_SCENE_H_
 #define SIMPLE_RENDER_SCENE_H_
 
-#include "baseScene.h"
+#include "base_scene.h"
 #include <core/types.h>
 #include <string>
 

src/run_modes/testbed/testbed.cpp

@@ -7,8 +7,8 @@
 ******************************************************************************/
 
 #include "testbed.h"
-#include "scenes/simpleRenderScene.h"
+#include "scenes/simple_render_scene.h"
-#include "scenes/physicsScene.h"
+#include "scenes/physics_scene.h"
 
 #include <core/core.h>
 #include <utils/logger.h>

src/run_modes/testbed/testbed.h

@@ -11,7 +11,7 @@
 
 #include <core/run_mode.h>
 #include <core/types.h>
-#include "scenes/baseScene.h"
+#include "scenes/base_scene.h"
 
 namespace lunarium
 {

src/scripting/coreAPI.cpp

@@ -9,7 +9,7 @@
 ******************************************************************************/
 
 #include "coreAPI.h"
-#include "scriptManager.h"
+#include "script_manager.h"
 #include <core/core.h>
 #include <utils/logger.h>
 

src/scripting/script_manager.cpp

@@ -1,5 +1,5 @@
 /******************************************************************************
-*	File		-	scriptManager.cpp
+*	File		-	script_manager.cpp
 *	Author		-	Joey Pollack
 *	Date		-	2021/08/30 (y/m/d)
 *	Mod Date	-	2021/09/02 (y/m/d)
@@ -8,7 +8,7 @@
 *                   history of errors that can be queried.
 ******************************************************************************/
 
-#include "scriptManager.h"
+#include "script_manager.h"
 #include <utils/logger.h>
 #include <sstream>
 

src/scripting/script_manager.h

@@ -1,5 +1,5 @@
 /******************************************************************************
-*	File		-	scriptManager.h
+*	File		-	script_manager.h
 *	Author		-	Joey Pollack
 *	Date		-	2021/08/30 (y/m/d)
 *	Mod Date	-	2021/09/02 (y/m/d)

src/utils/binary_file_buffer.cpp

@@ -1,5 +1,5 @@
 /******************************************************************************
-*	File		-	BinaryFileBuffer.cpp
+*	File		-	binary_file_buffer.cpp
 *	Author		-	Joey Pollack
 *	Date		-	2020/01/24 (y/m/d)
 *	Mod Date	-	2020/01/24 (y/m/d)
@@ -8,7 +8,7 @@
 *					large files chunk by chunk.
 ******************************************************************************/
 
-#include "binaryFileBuffer.h"
+#include "binary_file_buffer.h"
 #include <fstream>
 #include <string.h>
 

src/utils/binary_file_buffer.h

@@ -1,5 +1,5 @@
 /******************************************************************************
-*	File		-	BinaryFileBuffer.h
+*	File		-	binary_file_buffer.h
 *	Author		-	Joey Pollack
 *	Date		-	2020/01/24 (y/m/d)
 *	Mod Date	-	2020/01/24 (y/m/d)

src/utils/frame_counter.cpp

@@ -1,12 +1,12 @@
 /******************************************************************************
-*	File		-	FrameCounter.cpp
+*	File		-	frame_counter.cpp
 *	Author		-	Joey Pollack
 *	Date		-	2021/09/03 (y/m/d)
 *	Mod Date	-	2021/09/03 (y/m/d)
 *	Description	-	Tracks frame statistics
 ******************************************************************************/
 
-#include "frameCounter.h"
+#include "frame_counter.h"
 #include <cstring>
 
 namespace lunarium

src/utils/frame_counter.h

@@ -1,5 +1,5 @@
 /******************************************************************************
-*	File		-	FrameCounter.h
+*	File		-	frame_counter.h
 *	Author		-	Joey Pollack
 *	Date		-	2021/09/03 (y/m/d)
 *	Mod Date	-	2021/09/03 (y/m/d)
@@ -10,7 +10,7 @@
 #define FRAME_COUNTER_H_
 
 #include <stdint.h>
-#include "highResTimer.h"
+#include "high_resolution_timer.h"
 
 namespace lunarium
 {

src/utils/high_resolution_timer.cpp

@@ -1,5 +1,5 @@
 /******************************************************************************
-* Filename:  		HighResTimer.cpp
+* Filename:  		high_resolution_timer.cpp
 * Date:      		12/06/2010
 * Mod. Date: 		03/21/2018
 * Author:    		Joseph R. Pollack
@@ -8,7 +8,7 @@
 *					does not include windows.h in the header.
 ******************************************************************************/
 
-#include "highResTimer.h"
+#include "high_resolution_timer.h"
 
 using std::chrono::high_resolution_clock;
 using std::chrono::duration;

src/utils/high_resolution_timer.h

@@ -1,5 +1,5 @@
 /******************************************************************************
-* Filename:  		HighResTimer.h
+* Filename:  		high_resolution_timer.h
 * Date:      		12/06/2010
 * Mod. Date: 		03/21/2018
 * Author:    		Joseph R. Pollack

src/utils/logger.cpp

@@ -323,7 +323,7 @@ namespace lunarium
 		va_end(args);
 	}
 
-	void Logger::GIInfo(uint32_t LogCategory, const char* message, ...)
+	void Logger::GIError(uint32_t LogCategory, const char* message, ...)
 	{
 		va_list args;
 		va_start(args, message);

src/utils/logger.h

@@ -17,9 +17,9 @@
 #include <map>
 #include <fstream>
 
-// TODO: Remove the dependence on HighResTimer.h
+// TODO: Remove the dependence on high_resolution_timer.h
 //			OR re-write HighResTimer with modern timer code
-#include "highResTimer.h"
+#include "high_resolution_timer.h"
 
 // Conflict with a region flag in wingdi.h
 #undef ERROR
@@ -170,7 +170,7 @@ namespace lunarium
 		static void Info(uint32_t LogCategory, const char* message, ...);
 		static void Debug(uint32_t LogCategory, const char* message, ...);
 		static void Trace(uint32_t LogCategory, const char* message, ...);
-		static void GIInfo(uint32_t LogCategory, const char* message, ...);
+		static void GIError(uint32_t LogCategory, const char* message, ...);
 		static void GIDebug(uint32_t LogCategory, const char* message, ...);
 		void Log_buff(uint32_t logCategory, uint32_t logLevel);