Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
8ff00ca5
Commit
8ff00ca5
authored
Jan 24, 2019
by
Juan Linietsky
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make recursive nature of iteration not fail.
parent
99d997e4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
main.cpp
main/main.cpp
+4
-4
main.h
main/main.h
+1
-1
No files found.
main/main.cpp
View file @
8ff00ca5
...
...
@@ -1789,9 +1789,9 @@ uint64_t Main::target_ticks = 0;
uint32_t
Main
::
frames
=
0
;
uint32_t
Main
::
frame
=
0
;
bool
Main
::
force_redraw_requested
=
false
;
bool
Main
::
iterating
=
false
;
int
Main
::
iterating
=
0
;
bool
Main
::
is_iterating
()
{
return
iterating
;
return
iterating
>
0
;
}
// For performance metrics
...
...
@@ -1803,7 +1803,7 @@ bool Main::iteration() {
//for now do not error on this
//ERR_FAIL_COND_V(iterating, false);
iterating
=
true
;
iterating
++
;
uint64_t
ticks
=
OS
::
get_singleton
()
->
get_ticks_usec
();
Engine
::
get_singleton
()
->
_frame_ticks
=
ticks
;
...
...
@@ -1932,7 +1932,7 @@ bool Main::iteration() {
frames
=
0
;
}
iterating
=
false
;
iterating
--
;
if
(
fixed_fps
!=
-
1
)
return
exit
;
...
...
main/main.h
View file @
8ff00ca5
...
...
@@ -47,7 +47,7 @@ class Main {
static
uint32_t
frames
;
static
uint32_t
frame
;
static
bool
force_redraw_requested
;
static
bool
iterating
;
static
int
iterating
;
public
:
static
bool
is_project_manager
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment