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.

Sign up for GitHub

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

Jump to bottom

[ISU-087]:[theweirdn8]: Update main.cpp to not have editor runtime co… #84

Merged
merged 1 commit into from
Mar 26, 2023
Merged

[ISU-087]:[theweirdn8]: Update main.cpp to not have editor runtime co… #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 13 additions & 12 deletions Game_Pencil_Engine_IDE.depend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<stdio.h>
<math.h>

1675137371 c:\users\thewe\onedrive\documents\pawbyte_workspace\game-pencil-engine-editor\src\gpe\gpe_common_includes.h
1679652617 c:\users\thewe\onedrive\documents\pawbyte_workspace\game-pencil-engine-editor\src\gpe\gpe_common_includes.h
<istream>
<algorithm>
<fstream>
Expand All @@ -60,7 +60,7 @@
<sstream>
<string>
<vector>
"limits.h"
<climits>
<windows.h>
<Commdlg.h>
<cerrno>
Expand Down Expand Up @@ -147,7 +147,7 @@
"gpe_tilesheet.h"
"internal_libs/stg_ex.h"

1675137371 c:\users\thewe\onedrive\documents\pawbyte_workspace\game-pencil-engine-editor\src\gpe\gpe_animation2d.h
1679610171 c:\users\thewe\onedrive\documents\pawbyte_workspace\game-pencil-engine-editor\src\gpe\gpe_animation2d.h
<vector>
<string>
<cmath>
Expand All @@ -157,7 +157,7 @@
"gpe_branch.h"
"gpe_renderer_base.h"
"gpe_texture_base.h"
"internal_libs\stg_ex.h"
"internal_libs/stg_ex.h"

1675137371 c:\users\thewe\onedrive\documents\pawbyte_workspace\game-pencil-engine-editor\src\gpe\gpe_collisions.h
<algorithm>
Expand Down Expand Up @@ -210,7 +210,7 @@
1675137371 c:\users\thewe\onedrive\documents\pawbyte_workspace\game-pencil-engine-editor\src\gpe\gpe_basic_object_list.h
"gpe_basic_object.h"

1679016602 c:\users\thewe\onedrive\documents\pawbyte_workspace\game-pencil-engine-editor\src\gpe\gpe_basic_object.h
1679017165 c:\users\thewe\onedrive\documents\pawbyte_workspace\game-pencil-engine-editor\src\gpe\gpe_basic_object.h
"gpe_camera.h"
"gpe_color.h"
"gpe_constants.h"
Expand Down Expand Up @@ -281,7 +281,7 @@
"gpe_spatial_partition_layer.h"
"gpe_error_logger.h"

1675787088 c:\users\thewe\onedrive\documents\pawbyte_workspace\game-pencil-engine-editor\src\gpe\gpe_collision_controller_base.h
1679017165 c:\users\thewe\onedrive\documents\pawbyte_workspace\game-pencil-engine-editor\src\gpe\gpe_collision_controller_base.h
"gpe_basic_object.h"
<string>

Expand Down Expand Up @@ -324,7 +324,7 @@
"gpe_common_includes.h"
"gpe_branch.h"

1675787675 c:\users\thewe\onedrive\documents\pawbyte_workspace\game-pencil-engine-editor\src\gpe\gpe_scene.h
1679017165 c:\users\thewe\onedrive\documents\pawbyte_workspace\game-pencil-engine-editor\src\gpe\gpe_scene.h
"gpe_basic_object.h"
"gpe_branch.h"
"gpe_layer.h"
Expand All @@ -342,7 +342,7 @@
"gpe/gpe.h"
"gpe/internal_libs/semath.h"

1675784077 source:c:\users\thewe\onedrive\documents\pawbyte_workspace\game-pencil-engine-editor\src\game_state_master.cpp
1679017165 source:c:\users\thewe\onedrive\documents\pawbyte_workspace\game-pencil-engine-editor\src\game_state_master.cpp
"game_state_master.h"

1675137371 c:\users\thewe\onedrive\documents\pawbyte_workspace\game-pencil-engine-editor\src\game_state_master.h
Expand Down Expand Up @@ -378,7 +378,7 @@
1675137371 source:c:\users\thewe\onedrive\documents\pawbyte_workspace\game-pencil-engine-editor\src\gpe\gpe_background.cpp
"gpe_background.h"

1675625842 source:c:\users\thewe\onedrive\documents\pawbyte_workspace\game-pencil-engine-editor\src\gpe\gpe_basic_object.cpp
1679017165 source:c:\users\thewe\onedrive\documents\pawbyte_workspace\game-pencil-engine-editor\src\gpe\gpe_basic_object.cpp
"gpe_artist_base.h"
"gpe_basic_object.h"
"gpe_color_manager.h"
Expand All @@ -400,7 +400,7 @@
"gpe_camera.h"
"gpe_constants.h"

1675786967 source:c:\users\thewe\onedrive\documents\pawbyte_workspace\game-pencil-engine-editor\src\gpe\gpe_collision_controller_base.cpp
1679017165 source:c:\users\thewe\onedrive\documents\pawbyte_workspace\game-pencil-engine-editor\src\gpe\gpe_collision_controller_base.cpp
"gpe_collision_controller_base.h"

1675137371 source:c:\users\thewe\onedrive\documents\pawbyte_workspace\game-pencil-engine-editor\src\gpe\gpe_collisions.cpp
Expand Down Expand Up @@ -495,7 +495,7 @@
"gpe_artist_base.h"
"internal_libs/semath.h"

1675787762 source:c:\users\thewe\onedrive\documents\pawbyte_workspace\game-pencil-engine-editor\src\gpe\gpe_scene.cpp
1679017165 source:c:\users\thewe\onedrive\documents\pawbyte_workspace\game-pencil-engine-editor\src\gpe\gpe_scene.cpp
"gpe_scene.h"

1675137371 source:c:\users\thewe\onedrive\documents\pawbyte_workspace\game-pencil-engine-editor\src\gpe\gpe_settings.cpp
Expand Down Expand Up @@ -1472,7 +1472,8 @@
"gpe_renderer_sdl.h"
"../gpe/gpe_texture_target_base.h"

1675137371 source:c:\users\thewe\onedrive\documents\pawbyte_workspace\game-pencil-engine-editor\src\sdl2_module\gpe_audio_sdl2_mixer.cpp
1679652617 source:c:\users\thewe\onedrive\documents\pawbyte_workspace\game-pencil-engine-editor\src\sdl2_module\gpe_audio_sdl2_mixer.cpp
"../gpe/gpe_common_includes.h"
"gpe_audio_sdl2_mixer.h"
"../gpe/gpe_error_logger.h"

Expand Down
16 changes: 7 additions & 9 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,7 @@ int main( int argc, char* args[] )
gameFailed = 1;
}

gpe::time_keeper->set_fps( 60 );

//gpe::time_keeper->set_fps( gpe::settings->defaultFPS );
gpe::time_keeper->set_fps( gpe::settings->defaultFPS );

//Our preferred order, although some people may do it in their own way
game_state_credits_base * game_credits = new game_state_credits_base("game_credits");
Expand All @@ -105,10 +103,10 @@ int main( int argc, char* args[] )
gpe::game_runtime->state_set( shape_tester->get_state_name() );


/*if( init_gpe_master_itenary( argc, args ) == false )
if( init_gpe_master_itenary( argc, args ) == false )
{
gameFailed = -2000;
}*/
}

gpe::time_keeper->set_fps( 60 );

Expand All @@ -118,10 +116,10 @@ int main( int argc, char* args[] )
gpe::quit_core_engine();
return gameFailed;
}

if( gpe::game_runtime->game_loop() )
{
gpe::error_log->report("Completed Game Loop....");
if( gpe::game_runtime->game_loop() )
{
gpe::error_log->report("Completed Game Loop....");
}

//Clean up
Expand Down