halotroop
/
Ginger3D
1
0
Fork 0
Code Pull Requests Packages Releases Activity

Moved debug stuff

pull/12/head
Caroline Bell 2020-02-29 18:12:15 -08:00
parent d66e0bda90
commit 9c46f2a9b5
1 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/github/halotroop/litecraft/Litecraft.java
View File

@ -71,23 +71,9 @@ public class Litecraft extends Game
@Override @Override
public void render() public void render()
{ {
<<<<<<< Upstream, based on branch 'liteCraft' of https://github.com/halotroop/Ginger3D.git
fps += 1; // This section updates the debug stats once per real-time second, regardless of how many frames have been rendered fps += 1; // This section updates the debug stats once per real-time second, regardless of how many frames have been rendered
if (System.currentTimeMillis() > frameTimer + 1000) if (System.currentTimeMillis() > frameTimer + 1000)
{
this.dbgStats.set(fps, ups, tps, threadWaitlist);
this.fps = 0;
this.ups = 0;
this.tps = 0;
this.frameTimer += 1000;
}
/**
* And now, the actual rendering:
*/
=======
fps+=1;
updateDebugStats(); updateDebugStats();
>>>>>>> 4b249f6 Moved stuff around
// Render shadows // Render shadows
GingerRegister.getInstance().masterRenderer.renderShadowMap(data.entities, data.lights.get(0)); GingerRegister.getInstance().masterRenderer.renderShadowMap(data.entities, data.lights.get(0));
// If there's a world, render it! // If there's a world, render it!
@ -100,8 +86,6 @@ public class Litecraft extends Game
// Updates the debug stats once per real-time second, regardless of how many frames have been rendered // Updates the debug stats once per real-time second, regardless of how many frames have been rendered
private void updateDebugStats() private void updateDebugStats()
{
if (System.currentTimeMillis() > frameTimer + 1000)
{ {
this.dbgStats.set(fps, ups, tps, threadWaitlist); this.dbgStats.set(fps, ups, tps, threadWaitlist);
this.fps=0; this.fps=0;
@ -109,7 +93,6 @@ public class Litecraft extends Game
this.tps=0; this.tps=0;
this.frameTimer += 1000; this.frameTimer += 1000;
} }
}
public void update() public void update()
{ {