Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

321 cleanup code #322

Merged
merged 33 commits into from
Aug 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
8a52ad2
Remove Extra Files
datacrystals Aug 22, 2022
3a2b663
Cleanup Header Files
datacrystals Aug 22, 2022
fa9beed
Cleanup Header Files
datacrystals Aug 22, 2022
9379cec
Cleanup Header Files
datacrystals Aug 22, 2022
cc81d85
Cleanup Header Files
datacrystals Aug 22, 2022
ae25f72
Cleanup Header Files
datacrystals Aug 22, 2022
fedd346
Cleanup Header Files
datacrystals Aug 22, 2022
7c402c9
Cleanup Header Files
datacrystals Aug 22, 2022
93f162e
Cleanup Header Files
datacrystals Aug 22, 2022
d601f9d
Cleanup Header Files
datacrystals Aug 22, 2022
565dcb8
Cleanup Header Files
datacrystals Aug 22, 2022
db1bcac
Cleanup Header Files
datacrystals Aug 22, 2022
221e736
Cleanup Header Files
datacrystals Aug 22, 2022
560cc95
Cleanup Header Files
datacrystals Aug 22, 2022
5e0b190
Cleanup Header Files
datacrystals Aug 22, 2022
5170833
Cleanup Header Files
datacrystals Aug 22, 2022
5ff6df3
Cleanup Header Files
datacrystals Aug 22, 2022
a7532b0
Cleanup Header Files
datacrystals Aug 22, 2022
bfb92db
Cleanup Header Files
datacrystals Aug 22, 2022
6ab96b7
Cleanup Header Files
datacrystals Aug 22, 2022
3fef6a3
Cleanup Header Files
datacrystals Aug 22, 2022
4679f12
Cleanup Header Files
datacrystals Aug 22, 2022
793d30a
Cleanup Header Files
datacrystals Aug 22, 2022
55cac55
Cleanup Header Files
datacrystals Aug 22, 2022
d172d77
Cleanup Header Files
datacrystals Aug 22, 2022
8c4ad83
Cleanup Header Files
datacrystals Aug 24, 2022
7a674bb
Cleanup Header Files
datacrystals Aug 24, 2022
1c1fca6
Cleanup Header Files
datacrystals Aug 24, 2022
50d0317
Cleanup Header Files
datacrystals Aug 24, 2022
1c12a92
Cleanup Header Files
datacrystals Aug 24, 2022
5e835dd
Cleanup Header Files
datacrystals Aug 24, 2022
ca5e5d8
Cleanup Header Files
datacrystals Aug 24, 2022
5a918a7
Cleanup Header Files
datacrystals Aug 24, 2022
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
27 changes: 13 additions & 14 deletions Source/Core/Editor/GUI.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,27 +53,26 @@ class GUISystem {

private:

GLFWwindow* Window_; /**<Pointer to window instance*/
ERS_STRUCT_SystemUtils* SystemUtils_; /**<Structure Containing Pointers To System Utilities*/
ERS_STRUCT_ProjectUtils* ProjectUtils_; /**ProjectUtils Struct Pointer*/
Cursors3D* Cursors3D_; /**<Pointer to Cursors3D Instance*/
ERS_CLASS_SceneManager* SceneManager_; /**<Scene Manager Instance Pointer*/
ERS_CLASS_VisualRenderer* VisualRenderer_; /**<Pointer to visual renderer for viewport modification*/
ERS_STRUCT_HumanInputDeviceUtils* HIDUtils_; /**<Pointer To Human Device Utils Struct*/

std::unique_ptr<ERS_CLASS_FontManager> FontManager_; /**<Pointer To FontManager Instance*/
GLFWwindow* Window_ = nullptr; /**<Pointer to window instance*/
ERS_STRUCT_SystemUtils* SystemUtils_ = nullptr; /**<Structure Containing Pointers To System Utilities*/
ERS_STRUCT_ProjectUtils* ProjectUtils_ = nullptr; /**ProjectUtils Struct Pointer*/
Cursors3D* Cursors3D_ = nullptr; /**<Pointer to Cursors3D Instance*/
ERS_CLASS_SceneManager* SceneManager_ = nullptr; /**<Scene Manager Instance Pointer*/
ERS_CLASS_VisualRenderer* VisualRenderer_ = nullptr; /**<Pointer to visual renderer for viewport modification*/
ERS_STRUCT_HumanInputDeviceUtils* HIDUtils_ = nullptr; /**<Pointer To Human Device Utils Struct*/

std::unique_ptr<ERS_CLASS_FontManager> FontManager_; /**<Pointer To FontManager Instance*/
std::unique_ptr<ERS_CLASS_UserProfileManager> UserProfileManager_; /**<Pointer To User Profile Manager Instance*/

std::unique_ptr<ERS_CLASS_WindowManager> WindowManager_; /**<Class owning all gui windows*/
std::unique_ptr<ERS_CLASS_WindowManager> WindowManager_; /**<Class owning all gui windows*/

public:

std::unique_ptr<ERS_CLASS_ThemeManager> ThemeManager_; /**<Pointer To ThemeManager Instance*/

// Menu Items
std::unique_ptr<GUI_Menu_File> Menu_File_; /**<Editor Menu Entry*/
std::unique_ptr<GUI_Menu_Window> Menu_Window_; /**<Editor Menu Entry*/
std::unique_ptr<GUI_Menu_Debug> Menu_Debug_; /**<Editor Menu Entry*/
std::unique_ptr<GUI_Menu_File> Menu_File_; /**<Editor Menu Entry*/
std::unique_ptr<GUI_Menu_Window> Menu_Window_; /**<Editor Menu Entry*/
std::unique_ptr<GUI_Menu_Debug> Menu_Debug_; /**<Editor Menu Entry*/
std::unique_ptr<GUI_Menu_Settings> Menu_Settings_; /**<Editor Menu Entry*/


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class ERS_CLASS_OpenGLDebug {

private:

ERS_STRUCT_SystemUtils* SystemUtils_; /**<SystemUtils Instance, Used To Get Systems From Other Classes*/
ERS_STRUCT_SystemUtils* SystemUtils_ = nullptr; /**<SystemUtils Instance, Used To Get Systems From Other Classes*/
std::unique_ptr<ERS_CLASS_OpenGLLoggingSystem> ERS_CLASS_OpenGLLoggingSystem_; /**<Logging System Used To Get OpenGL Callback Data*/

bool DebugEnabled_ = false; /**<Used To Toggle On Or Off The Associated GL_DEBUG_OUTPUT Enum*/
Expand Down
10 changes: 4 additions & 6 deletions Source/Core/Editor/Menus/GUI_Menu_Debug/GUI_Menu_Debug.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,10 @@ class GUI_Menu_Debug {

private:

ERS_STRUCT_SystemUtils* SystemUtils_; /**<SystemUtils Instance, Used To Get Systems From Other Classes*/
ERS_STRUCT_Windows* Windows_; /**<Windows struct*/
ERS_CLASS_WindowManager* WindowManager_; /**<Used for window debugging, controls all windows systemwide*/

std::unique_ptr<ERS_CLASS_OpenGLDebug> ERS_CLASS_OpenGLDebug_; /**<Class used to draw the opengl debug menu into the main debug menu*/

ERS_STRUCT_SystemUtils* SystemUtils_ = nullptr; /**<SystemUtils Instance, Used To Get Systems From Other Classes*/
ERS_STRUCT_Windows* Windows_ = nullptr; /**<Windows struct*/
ERS_CLASS_WindowManager* WindowManager_ = nullptr; /**<Used for window debugging, controls all windows systemwide*/
std::unique_ptr<ERS_CLASS_OpenGLDebug> ERS_CLASS_OpenGLDebug_; /**<Class used to draw the opengl debug menu into the main debug menu*/

bool ShowImGuiDemoWindow_ = false; /**<Show/hide ImGui DemoWindow*/
bool DebugMenuEnabled_ = false; /**Enable/Disable Debug Menu*/
Expand Down
14 changes: 6 additions & 8 deletions Source/Core/Editor/Menus/GUI_Menu_File/GUI_Menu_File.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,12 @@ class GUI_Menu_File {

private:

ERS_STRUCT_SystemUtils* SystemUtils_; /**<SystemUtils Instance, Used To Get Systems From Other Classes*/
ERS_CLASS_VisualRenderer* VisualRenderer_; /**<shared pointer to visual renderer*/
ERS_STRUCT_Windows* Windows_; /**<Struct containing all windows*/

std::unique_ptr<SceneWriter> SceneWriter_; /**<Scene Writer Instance Pointer*/
ERS_CLASS_SceneManager* SceneManager_; /**<Scene Manager Instance Pointer*/
ERS_STRUCT_ProjectUtils* ProjectUtils_; /**<Pointer To Project Utils Instance*/

ERS_STRUCT_SystemUtils* SystemUtils_ = nullptr; /**<SystemUtils Instance, Used To Get Systems From Other Classes*/
ERS_CLASS_VisualRenderer* VisualRenderer_ = nullptr; /**<shared pointer to visual renderer*/
ERS_STRUCT_Windows* Windows_ = nullptr; /**<Struct containing all windows*/
ERS_CLASS_SceneManager* SceneManager_ = nullptr; /**<Scene Manager Instance Pointer*/
ERS_STRUCT_ProjectUtils* ProjectUtils_ = nullptr; /**<Pointer To Project Utils Instance*/
std::unique_ptr<SceneWriter> SceneWriter_; /**<Scene Writer Instance Pointer*/

public:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ class GUI_Menu_Settings {

private:

ERS_STRUCT_SystemUtils* SystemUtils_; /**<SystemUtils Instance, Used To Get Systems From Other Classes*/
ERS_STRUCT_HumanInputDeviceUtils* HIDUtils_; /**<HID Utils Pointer*/
ERS_STRUCT_Windows* Windows_; /**<Struct Containing the system's windows*/
ERS_STRUCT_SystemUtils* SystemUtils_ = nullptr; /**<SystemUtils Instance, Used To Get Systems From Other Classes*/
ERS_STRUCT_HumanInputDeviceUtils* HIDUtils_ = nullptr; /**<HID Utils Pointer*/
ERS_STRUCT_Windows* Windows_ = nullptr; /**<Struct Containing the system's windows*/



Expand Down
7 changes: 3 additions & 4 deletions Source/Core/Editor/Menus/GUI_Menu_Window/GUI_Menu_Window.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,9 @@ class GUI_Menu_Window {

private:

ERS_STRUCT_SystemUtils* SystemUtils_; /**<SystemUtils Instance, Used To Get Systems From Other Classes*/

ERS_STRUCT_Windows* Windows_; /**<WIndows struct*/
ERS_CLASS_VisualRenderer* VisualRenderer_; /**<ERS_CLASS_VisualRenderer instance*/
ERS_STRUCT_SystemUtils* SystemUtils_ = nullptr; /**<SystemUtils Instance, Used To Get Systems From Other Classes*/
ERS_STRUCT_Windows* Windows_ = nullptr; /**<WIndows struct*/
ERS_CLASS_VisualRenderer* VisualRenderer_ = nullptr; /**<ERS_CLASS_VisualRenderer instance*/


public:
Expand Down
25 changes: 12 additions & 13 deletions Source/Core/Editor/Utils/ERS_Editor_3DCursor/ERS_Editor_3DCursor.h
Original file line number Diff line number Diff line change
Expand Up @@ -69,25 +69,24 @@ class Cursors3D {
};


bool IsCursorActive_; /**<Indicates If Cursor Active Or Disabled*/
bool EnableRotation_; /**<Enable/Disable The Rotation Gizmo*/
bool EnableScale_; /**<Enable/Disable The Scale Gizmo*/
float* CameraView_; /**<Camera View Matrix, Converted From GLM::Mat4*/
float* CameraProjection_; /**<Camera Projection Matrix, Converted From GLM::Mat4*/

float GridSnapAmountTranslate_; /**<Unit To Snap To On Grid During Translation Mode*/
float GridSnapAmountRotate_; /**<Unit To Snap To On Grid During Rotation Mode*/
float GridSnapAmountScale_; /**<Unit To Snap To On Grid During Scale Mode*/

ERS_STRUCT_Camera* Camera_; /**<Camera Object Pointer*/
bool IsCursorActive_ = false; /**<Indicates If Cursor Active Or Disabled*/
bool EnableRotation_ = false; /**<Enable/Disable The Rotation Gizmo*/
bool EnableScale_ = false; /**<Enable/Disable The Scale Gizmo*/
bool LastFrameActiveState_ = false; /*<If the cursor was being used in the last frame or not*/
float* CameraView_ = nullptr; /**<Camera View Matrix, Converted From GLM::Mat4*/
float* CameraProjection_ = nullptr; /**<Camera Projection Matrix, Converted From GLM::Mat4*/
float GridSnapAmountTranslate_ = -1.0f; /**<Unit To Snap To On Grid During Translation Mode*/
float GridSnapAmountRotate_ = -1.0f; /**<Unit To Snap To On Grid During Rotation Mode*/
float GridSnapAmountScale_ = -1.0f; /**<Unit To Snap To On Grid During Scale Mode*/
int DisableGizmoForFrames_ = 0; /**<If nonzero, will disable the gizmo*/

ERS_STRUCT_Camera* Camera_ = nullptr; /**<Camera Object Pointer*/
ImGuizmo::OPERATION CurrentGizmoOperation_ = ImGuizmo::TRANSLATE; /**<Set Current Cursor Operation*/
ImGuizmo::MODE GizmoMode_ = ImGuizmo::WORLD; /**<Set Default Coordinate Space*/

glm::vec3 InitialPos_; /**<Initial Scale, Used To Cancel Movement If Escape Is Pressed During An Operation*/
glm::vec3 InitialRot_; /**<Initial Scale, Used To Cancel Movement If Escape Is Pressed During An Operation*/
glm::vec3 InitialScale_; /**<Initial Scale, Used To Cancel Movement If Escape Is Pressed During An Operation*/
int DisableGizmoForFrames_ = 0; /**<If nonzero, will disable the gizmo*/
bool LastFrameActiveState_ = false; /*<If the cursor was being used in the last frame or not*/

public:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class ERS_CLASS_FontManager {
private:

ERS_CLASS_LoggingSystem* Logger_; /**<ERS_CLASS_LoggingSystem Instance Pointer*/
const char* FontsDirectoryPath_; /**<Path where fonts are to be searched for */
const char* FontsDirectoryPath_; /**<Path where fonts are to be searched for */

bool EndsWith(const std::string& Input, const std::string& Ending);

Expand All @@ -40,9 +40,9 @@ class ERS_CLASS_FontManager {
std::vector<std::string> FontPathList_; /**<List of fonts located at the given paths*/
std::vector<std::string> FontNameList_; /**<List of font names for gui rendering*/

float FontSize_ = 14; /**<Set Default Font Size In Pixels*/
int FontSelector_ = 0; /**<Set Font Selector Int*/
bool UpdateFont_ = false; /**<Indicate If Font Needs To Be Updated*/
float FontSize_ = 14; /**<Set Default Font Size In Pixels*/
int FontSelector_ = 0; /**<Set Font Selector Int*/
bool UpdateFont_ = false; /**<Indicate If Font Needs To Be Updated*/



Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ class ERS_CLASS_LayoutManager {

private:

ERS_CLASS_LoggingSystem* Logger_; /**<ERS_CLASS_LoggingSystem Instance Pointer*/
std::string LayoutDirectory_; /**<This string stores the path to the editor's layout directory ending in a trailing slash*/
ERS_CLASS_LoggingSystem* Logger_ = nullptr; /**<ERS_CLASS_LoggingSystem Instance Pointer*/
std::string LayoutDirectory_; /**<This string stores the path to the editor's layout directory ending in a trailing slash*/

std::vector<YAML::Node> LayoutFiles_; /**<List Of YAML::Node files*/
int Index = 0; /**<The index of Layout structs*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,18 @@ class ERS_CLASS_ThemeManager {
private:

ERS_CLASS_LoggingSystem* Logger_; /**<ERS_CLASS_LoggingSystem Instance*/
const char* ThemePath_; /**<Filepath Where Themes Are Located*/
const char* ThemePath_; /**<Filepath Where Themes Are Located*/

std::vector<YAML::Node> ThemeFiles_; /**<List Of YAML::Node files*/

ImVec4 ReadColor(const char* NodeName, YAML::Node Target); /**<Reads A Color From The Config*/
/**
* @brief Reads a color from the configuration file.
*
* @param NodeName
* @param Target
* @return ImVec4
*/
ImVec4 ReadColor(const char* NodeName, YAML::Node Target);


public:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,20 @@ class ERS_CLASS_UserProfileManager {

private:

ERS_CLASS_LoggingSystem* Logger_; /**<ERS_CLASS_LoggingSystem Instance Pointer*/
std::string UserProfilePath_; /**<Path To User Profile*/
YAML::Node UserProfile_; /**<YAML::Node Containing User Profile*/
ERS_CLASS_LoggingSystem* Logger_; /**<ERS_CLASS_LoggingSystem Instance Pointer*/
YAML::Node UserProfile_; /**<YAML::Node Containing User Profile*/
std::string UserColorProfileName_; /**<User Color Profile Name*/
std::string UserProfilePath_; /**<Path To User Profile*/
std::string UserFont_; /**<Name Of user fornt*/
int UserFontSize_; /**<Size of user font*/

void LoadUserProfile(); /**<Load User Profile*/

std::string UserFont_; /**<Name Of user fornt*/
int UserFontSize_; /**<Size of user font*/
std::string UserColorProfileName_; /**<User Color Profile Name*/
/**
* @brief Loads a user profile.
*
*/
void LoadUserProfile();


public:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ class ERS_CLASS_WindowManager {

private:

ERS_STRUCT_SystemUtils* SystemUtils_; /**<Pointer to System utillities struct, used to get things like logger, etc.*/
std::unique_ptr<ERS_STRUCT_Windows> Windows_; /**<Pointer to struct containing all windows setup in this subsystem*/
std::vector<std::string> WindowNames_; /**<List of all understood window names, populated by constructor*/
ERS_STRUCT_SystemUtils* SystemUtils_ = nullptr; /**<Pointer to System utillities struct, used to get things like logger, etc.*/
std::unique_ptr<ERS_STRUCT_Windows> Windows_; /**<Pointer to struct containing all windows setup in this subsystem*/
std::vector<std::string> WindowNames_; /**<List of all understood window names, populated by constructor*/

public:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class ERS_CLASS_AssetStreamingManager {
ERS_STRUCT_Scene* CurrentScene_ = nullptr; /**<Pointer to the current scene*/
bool HasSceneChanged_ = false; /**<Indicate if the scene has changed since the last frame*/
std::vector<ERS_STRUCT_Camera*> Cameras_; /**<List of cameras that assets are loaded around*/
ERS_STRUCT_SystemUtils* SystemUtils_; /**<Struct containing essential services such as logging and Asset IO*/
ERS_STRUCT_SystemUtils* SystemUtils_ = nullptr; /**<Struct containing essential services such as logging and Asset IO*/



Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,25 +29,27 @@ class ERS_CLASS_ControllerInputManager {

private:

ERS_STRUCT_SystemUtils* SystemUtils_; /**<Pointer to SystemUtils Struct*/
ERS_STRUCT_SystemUtils* SystemUtils_; /**<Pointer to SystemUtils Struct*/
std::vector<bool> IsControllerSupported_; /**<Indicate If Controller Is Supported Or Not*/

int NumberInputDevices_ = 0; /**<Current Number Of "Joysticks" Connected*/
bool FirstFrame_ = true; /**<Only True On First Frame*/

int NumberInputDevices_ = 0; /**<Current Number Of "Joysticks" Connected*/
std::vector<bool> IsControllerSupported_; /**<Indicate If Controller Is Supported Or Not*/
bool FirstFrame_ = true; /**<Only True On First Frame*/


private:

void UpdateNumberInputDevices(); /**<Updates the number of Input Devices present.*/
void UpdateNumberInputDevices(); /**<Updates the number of Input Devices present.*/
void CheckIfSupportedControllers(); /**<Updates ControllerSupported List*/
void UpdateControllerStates(); /**<Updates the values for every controller param*/
void UpdateControllerStates(); /**<Updates the values for every controller param*/

public:

int NumberControllers_ = 0; /**<Current Number Of Detected Controllers*/
std::vector<GLFWgamepadstate> ControllerStates_; /**<Vector Of Controller States*/
std::vector<std::string> ControllerNames_; /**<Human Readable Names Of Controllers*/
std::vector<ERS_STRUCT_ControllerSettings> ControllerSettings_; /**<List of controller settings for each controller*/

std::vector<GLFWgamepadstate> ControllerStates_; /**<Vector Of Controller States*/
std::vector<std::string> ControllerNames_; /**<Human Readable Names Of Controllers*/
std::vector<ERS_STRUCT_ControllerSettings> ControllerSettings_; /**<List of controller settings for each controller*/
std::vector<ERS_STRUCT_ControllerSettings> AvailableControllerProfiles_; /**<List of different loaded profiles. Will try to pick based on correct one automatically*/

// TODO: add system to apply correct controller profile by name
Expand Down
35 changes: 19 additions & 16 deletions Source/Core/Manager/ERS_FramerateManager/ERS_FramerateManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,29 +28,32 @@ class ERS_CLASS_FramerateManager {

private:

std::chrono::high_resolution_clock Clock_; /**<High Res Clock Used For Frame Time Calcs*/
double TargetFrameTime_; /**<Target Frame Time In MS*/
std::chrono::high_resolution_clock Clock_; /**<High Res Clock Used For Frame Time Calcs*/
std::vector<double> FrameSamples_; /**<Sample Frame Times*/


double TargetFrameTime_ = -1.0f; /**<Target Frame Time In MS*/
double FrameStartTime_ = -1.0f; /**<Starting Time Of Frame*/
double FrameEndTime_ = -1.0f; /**<Ending Time Of Frame*/
double LastFrameTime_ = -1.0f; /**<Non-Averaged Last Frame Time*/
float AverageFrameTime_ = -1.0f; /**<Float representing the average time in ms*/
int NumberSamples_ = 20; /**<Set number of samples used in average*/
bool SyncToMonitorChanged_ = true; /**<Updates If Sync To Monitor Has Changed*/
bool LastFrameSyncToMonitor_ = false; /**<Check If Last Sync To Monitor Changed*/


double FrameStartTime_; /**<Starting Time Of Frame*/
double FrameEndTime_; /**<Ending Time Of Frame*/
double LastFrameTime_; /**<Non-Averaged Last Frame Time*/
float AverageFrameTime_; /**<Float representing the average time in ms*/
int NumberSamples_ = 20; /**<Set number of samples used in average*/
std::vector<double> FrameSamples_; /**<Sample Frame Times*/
bool SyncToMonitorChanged_ = true; /**<Updates If Sync To Monitor Has Changed*/
bool LastFrameSyncToMonitor_ = false; /**<Check If Last Sync To Monitor Changed*/


public:

int TargetFrameRate_ = 60; /**<Target Frame Rate In FPS*/
bool UnlockFramerate_ = false; /**<Run As Fast As Possible*/
bool SyncToMonitor_ = true; /**<Sync To Monitor FPS*/
int TargetFrameRate_ = 60; /**<Target Frame Rate In FPS*/
bool UnlockFramerate_ = false; /**<Run As Fast As Possible*/
bool SyncToMonitor_ = true; /**<Sync To Monitor FPS*/


std::vector<double> ActualFrameTimes_; /**<List of last thousand actual measured frame times in seconds*/
std::vector<double> AverageFrameTimes_; /**<List of average frame times*/
std::vector<float> ActualFrameTimesMS_; /**<Frame Times In MS*/
std::vector<double> ActualFrameTimes_; /**<List of last thousand actual measured frame times in seconds*/
std::vector<double> AverageFrameTimes_; /**<List of average frame times*/
std::vector<float> ActualFrameTimesMS_; /**<Frame Times In MS*/



Expand Down
7 changes: 4 additions & 3 deletions Source/Core/Manager/ERS_ProjectManager/ERS_ProjectManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,12 @@ class ERS_CLASS_ProjectManager {

private:

ERS_STRUCT_SystemUtils* SystemUtils_; /**<Pointer To System Utils Struct*/
ERS_STRUCT_SystemUtils* SystemUtils_; /**<Pointer To System Utils Struct*/
ERS_CLASS_ProjectLoader* ProjectLoader_; /**<Project Loader Util*/
ERS_CLASS_SceneManager* SceneManager_; /**<Scene Manager Class*/
ERS_CLASS_SceneLoader* SceneLoader_; /**<Scene Loader Instance*/
ERS_CLASS_SceneManager* SceneManager_; /**<Scene Manager Class*/
ERS_CLASS_SceneLoader* SceneLoader_; /**<Scene Loader Instance*/
ERS_CLASS_ProjectWriter* ProjectWriter_; /**<Project Writer Util*/

std::unique_ptr<ERS_CLASS_ControllerSettingsLoader> ControllerSettingsLoader_; /**<Controller Settings Loader*/


Expand Down
1 change: 1 addition & 0 deletions Source/Core/Manager/ERS_SceneManager/ERS_SceneManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ class ERS_CLASS_SceneManager{
public:

std::vector<std::unique_ptr<ERS_STRUCT_Scene>> Scenes_; /**<Vector Containing Scenes To Be Drawn*/

int ActiveScene_ = 0; /**<Set The Active Scene */

public:
Expand Down
Loading