abian/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Remove -fixedframe mode since it doesn't work at all

Browse Source 
This was SVN commit r7549.
This commit is contained in:
Ykkrosh 2010-05-20 00:55:02 +00:00
parent cdcee291cf
commit 78ccac427d
6 changed files with 6 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
binaries/system/readme.txt
View File

@ -4,7 +4,6 @@ COMMAND LINE OPTIONS:
-buildarchive ?
-conf:KEY=VALUE set a config value (overrides the contents of system.cfg)
-entgraph ?
-fixedframe enable fixed frame timing; ?
-g=F set the gamma correction to 'F' (default 1.0)
-listfiles ?
-profile=NAME ?

13
source/main.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2009 Wildfire Games.
/* Copyright (C) 2010 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -278,11 +278,9 @@ static void Frame()
g_Game->Update(TimeSinceLastFrame);
PROFILE_END( "simulation update" );
if (!g_FixedFrameTiming)
{
PROFILE( "camera update" );
g_Game->GetView()->Update(float(TimeSinceLastFrame));
}
PROFILE_START( "camera update" );
g_Game->GetView()->Update(float(TimeSinceLastFrame));
PROFILE_END( "camera update" );
if (!g_UseSimulation2)
{
@ -339,9 +337,6 @@ static void Frame()
g_Profiler.Frame();
if(g_FixedFrameTiming && frameCount==100)
kill_mainloop();
g_TerrainModified = false;
g_GameRestarted = false;
}

7
source/ps/GameSetup/Config.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2009 Wildfire Games.
/* Copyright (C) 2010 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -42,8 +42,6 @@ bool g_NoGLFramebufferObject = false;
bool g_Shadows = false;
bool g_FancyWater = false;
bool g_FixedFrameTiming = false;
float g_LodBias = 0.0f;
float g_Gamma = 1.0f;
@ -151,9 +149,6 @@ static void ProcessCommandLineArgs(const CmdLineArgs& args)
if (args.Has("entgraph"))
g_EntGraph = true;
if (args.Has("fixedframe"))
g_FixedFrameTiming = true;
if (args.Has("g"))
{
g_Gamma = (float)atof(args.Get("g"));

4
source/ps/GameSetup/Config.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2009 Wildfire Games.
/* Copyright (C) 2010 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -48,8 +48,6 @@ extern bool g_NoGLFramebufferObject;
extern bool g_Shadows;
// flag to switch on reflective/refractive water
extern bool g_FancyWater;
// flag to switch on fixed frame timing (RC: I'm using this for profiling purposes)
extern bool g_FixedFrameTiming;
extern float g_LodBias;
extern float g_Gamma;

16
source/ps/GameSetup/GameSetup.cpp
View File

@ -1040,22 +1040,6 @@ void Init(const CmdLineArgs& args, int flags)
ogl_WarnIfError();
if (g_FixedFrameTiming) {
CCamera &camera = *g_Game->GetView()->GetCamera();
#if 0 // TOPDOWN
camera.SetProjection(1.0f,10000.0f,DEGTORAD(90));
camera.m_Orientation.SetIdentity();
camera.m_Orientation.RotateX(DEGTORAD(90));
camera.m_Orientation.Translate(CELL_SIZE*250*0.5, 250, CELL_SIZE*250*0.5);
#else // std view
camera.SetProjection(1.0f,10000.0f,DEGTORAD(20));
camera.m_Orientation.SetXRotation(DEGTORAD(30));
camera.m_Orientation.RotateY(DEGTORAD(-45));
camera.m_Orientation.Translate(350, 350, -275);
#endif
camera.UpdateFrustum();
}
if (! g_AutostartMap.empty())
{
// Code copied mostly from atlas/GameInterface/Handlers/Map.cpp -

4
source/simulation/Scheduler.h
View File

@ -109,10 +109,6 @@ public:
static void ScriptingInit();
};
// made visible to main.cpp's Frame() so that it can abort after 100 frames
// if g_FixedFrameTiming == true (allows measuring performance).
extern int frameCount;
extern const int ORDER_DELAY;
#endif