forked from OctaForge/OctaCore
move timings vars in main.hh
This commit is contained in:
parent
cbe80ddd9c
commit
a462a2e8e4
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
#include "console.hh" /* conoutf */
|
#include "console.hh" /* conoutf */
|
||||||
#include "light.hh"
|
#include "light.hh"
|
||||||
#include "main.hh" // multiplayer
|
#include "main.hh" // multiplayer, timings
|
||||||
#include "octaedit.hh"
|
#include "octaedit.hh"
|
||||||
#include "rendergl.hh" /* has*, worldpos */
|
#include "rendergl.hh" /* has*, worldpos */
|
||||||
#include "renderva.hh"
|
#include "renderva.hh"
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
#include "command.hh"
|
#include "command.hh"
|
||||||
|
|
||||||
#include "console.hh"
|
#include "console.hh"
|
||||||
#include "main.hh" // fatal
|
#include "main.hh" // fatal, timings
|
||||||
|
|
||||||
#include <shared/cube.hh>
|
#include <shared/cube.hh>
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
#include "dynlight.hh"
|
#include "dynlight.hh"
|
||||||
|
|
||||||
|
#include "main.hh" // timings
|
||||||
#include "physics.hh" // collide
|
#include "physics.hh" // collide
|
||||||
#include "pvs.hh"
|
#include "pvs.hh"
|
||||||
#include "rendergl.hh" // camera1
|
#include "rendergl.hh" // camera1
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
#include "blend.hh"
|
#include "blend.hh"
|
||||||
|
#include "main.hh" // timings
|
||||||
#include "rendergl.hh" // xtraverts
|
#include "rendergl.hh" // xtraverts
|
||||||
#include "renderva.hh"
|
#include "renderva.hh"
|
||||||
#include "texture.hh"
|
#include "texture.hh"
|
||||||
|
|
|
@ -10,6 +10,11 @@ extern bool minimized;
|
||||||
extern float loadprogress;
|
extern float loadprogress;
|
||||||
extern bool inbetweenframes, renderedframe;
|
extern bool inbetweenframes, renderedframe;
|
||||||
|
|
||||||
|
extern int curtime; // current frame time
|
||||||
|
extern int lastmillis; // last time
|
||||||
|
extern int elapsedtime; // elapsed frame time
|
||||||
|
extern int totalmillis; // total elapsed time
|
||||||
|
|
||||||
struct dynent;
|
struct dynent;
|
||||||
extern dynent *player;
|
extern dynent *player;
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
#include "movie.hh"
|
#include "movie.hh"
|
||||||
|
|
||||||
#include "console.hh" /* conoutf */
|
#include "console.hh" /* conoutf */
|
||||||
#include "main.hh" // getfps, getclockmillis, screenw/h, inbetweenframes, renderedframe
|
#include "main.hh"
|
||||||
#include "rendergl.hh"
|
#include "rendergl.hh"
|
||||||
#include "rendertext.hh"
|
#include "rendertext.hh"
|
||||||
#include "texture.hh"
|
#include "texture.hh"
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
#include "console.hh" /* conoutf */
|
#include "console.hh" /* conoutf */
|
||||||
#include "light.hh"
|
#include "light.hh"
|
||||||
#include "main.hh" // renderprogress
|
#include "main.hh" // renderprogress, timings
|
||||||
#include "octaedit.hh"
|
#include "octaedit.hh"
|
||||||
#include "octarender.hh"
|
#include "octarender.hh"
|
||||||
#include "world.hh"
|
#include "world.hh"
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#include "blend.hh"
|
#include "blend.hh"
|
||||||
#include "console.hh" /* conoutf */
|
#include "console.hh" /* conoutf */
|
||||||
#include "light.hh"
|
#include "light.hh"
|
||||||
#include "main.hh" // mainmenu, keyrepeat, renderedframe, player, isconnected, multiplayer
|
#include "main.hh"
|
||||||
#include "material.hh"
|
#include "material.hh"
|
||||||
#include "octa.hh"
|
#include "octa.hh"
|
||||||
#include "octarender.hh"
|
#include "octarender.hh"
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
#include "physics.hh"
|
#include "physics.hh"
|
||||||
|
|
||||||
#include "console.hh" /* conoutf */
|
#include "console.hh" /* conoutf */
|
||||||
#include "main.hh" // player
|
#include "main.hh" // player, timings
|
||||||
#include "rendergl.hh" // camera1
|
#include "rendergl.hh" // camera1
|
||||||
#include "rendermodel.hh"
|
#include "rendermodel.hh"
|
||||||
#include "octa.hh"
|
#include "octa.hh"
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
#include "blend.hh"
|
#include "blend.hh"
|
||||||
#include "console.hh"
|
#include "console.hh"
|
||||||
#include "grass.hh"
|
#include "grass.hh"
|
||||||
#include "main.hh" // mainmenu, renderbackground, getfps, getclockmillis, screenw/h, inbetweenframes, renderedframe, player, fatal
|
#include "main.hh"
|
||||||
#include "material.hh"
|
#include "material.hh"
|
||||||
#include "pvs.hh"
|
#include "pvs.hh"
|
||||||
#include "octaedit.hh"
|
#include "octaedit.hh"
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#include "aa.hh"
|
#include "aa.hh"
|
||||||
#include "dynlight.hh"
|
#include "dynlight.hh"
|
||||||
#include "light.hh"
|
#include "light.hh"
|
||||||
#include "main.hh" // initwarning, fatal
|
#include "main.hh" // initwarning, fatal, timings
|
||||||
#include "material.hh"
|
#include "material.hh"
|
||||||
#include "octaedit.hh" // editmode
|
#include "octaedit.hh" // editmode
|
||||||
#include "octarender.hh"
|
#include "octarender.hh"
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#include "aa.hh"
|
#include "aa.hh"
|
||||||
#include "command.hh" // identflags
|
#include "command.hh" // identflags
|
||||||
#include "console.hh" /* conoutf */
|
#include "console.hh" /* conoutf */
|
||||||
#include "main.hh" // loadprogress, renderprogress
|
#include "main.hh" // loadprogress, renderprogress, timings
|
||||||
#include "octarender.hh"
|
#include "octarender.hh"
|
||||||
#include "physics.hh" // collidewall
|
#include "physics.hh" // collidewall
|
||||||
#include "pvs.hh"
|
#include "pvs.hh"
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
// renderparticles.cpp
|
// renderparticles.cpp
|
||||||
|
|
||||||
#include "console.hh" /* conoutf */
|
#include "console.hh" /* conoutf */
|
||||||
#include "main.hh" // initing, minimized, loadprogress
|
#include "main.hh" // initing, minimized, loadprogress, timings
|
||||||
#include "renderparticles.hh"
|
#include "renderparticles.hh"
|
||||||
#include "octaedit.hh" // editmode
|
#include "octaedit.hh" // editmode
|
||||||
#include "octarender.hh"
|
#include "octarender.hh"
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
#include "console.hh" /* conoutf */
|
#include "console.hh" /* conoutf */
|
||||||
#include "light.hh"
|
#include "light.hh"
|
||||||
|
#include "main.hh" // timings
|
||||||
#include "octaedit.hh" // editmode
|
#include "octaedit.hh" // editmode
|
||||||
#include "octarender.hh"
|
#include "octarender.hh"
|
||||||
#include "rendergl.hh"
|
#include "rendergl.hh"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#include "rendertext.hh"
|
#include "rendertext.hh"
|
||||||
|
|
||||||
#include "main.hh" // fatal
|
#include "main.hh" // fatal, totalmillis
|
||||||
#include "rendergl.hh" // xtraverts
|
#include "rendergl.hh" // xtraverts
|
||||||
#include "texture.hh"
|
#include "texture.hh"
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
#include "blend.hh"
|
#include "blend.hh"
|
||||||
#include "grass.hh"
|
#include "grass.hh"
|
||||||
#include "main.hh" // renderprogress
|
#include "main.hh" // renderprogress, timings
|
||||||
#include "octaedit.hh" // editmode
|
#include "octaedit.hh" // editmode
|
||||||
#include "octarender.hh"
|
#include "octarender.hh"
|
||||||
#include "pvs.hh"
|
#include "pvs.hh"
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#include "stain.hh"
|
#include "stain.hh"
|
||||||
|
|
||||||
#include "console.hh" /* conoutf */
|
#include "console.hh" /* conoutf */
|
||||||
#include "main.hh" // initing, loadprogress
|
#include "main.hh" // initing, loadprogress, timings
|
||||||
#include "material.hh"
|
#include "material.hh"
|
||||||
#include "rendergl.hh"
|
#include "rendergl.hh"
|
||||||
#include "renderlights.hh"
|
#include "renderlights.hh"
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
#include "water.hh"
|
#include "water.hh"
|
||||||
|
|
||||||
|
#include "main.hh" // timings
|
||||||
#include "material.hh"
|
#include "material.hh"
|
||||||
#include "octarender.hh"
|
#include "octarender.hh"
|
||||||
#include "rendergl.hh"
|
#include "rendergl.hh"
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
#include "cube.hh"
|
#include "cube.hh"
|
||||||
|
|
||||||
|
#include <engine/main.hh>
|
||||||
#include <engine/octaedit.hh>
|
#include <engine/octaedit.hh>
|
||||||
#include <engine/physics.hh>
|
#include <engine/physics.hh>
|
||||||
#include <engine/worldio.hh>
|
#include <engine/worldio.hh>
|
||||||
|
|
|
@ -1,11 +1,3 @@
|
||||||
// the interface the game uses to access the engine
|
|
||||||
|
|
||||||
extern int curtime; // current frame time
|
|
||||||
extern int lastmillis; // last time
|
|
||||||
extern int elapsedtime; // elapsed frame time
|
|
||||||
extern int totalmillis; // total elapsed time
|
|
||||||
extern int gamespeed, paused;
|
|
||||||
|
|
||||||
// command
|
// command
|
||||||
extern int variable(const char *name, int min, int cur, int max, int *storage, identfun fun, int flags);
|
extern int variable(const char *name, int min, int cur, int max, int *storage, identfun fun, int flags);
|
||||||
extern float fvariable(const char *name, float min, float cur, float max, float *storage, identfun fun, int flags);
|
extern float fvariable(const char *name, float min, float cur, float max, float *storage, identfun fun, int flags);
|
||||||
|
|
Loading…
Reference in a new issue