mirror of
https://gitea.wildfiregames.com/0ad/0ad.git
synced 2026-09-21 20:06:40 +00:00
ran everything though mark's newline stomper.
This was SVN commit r322.
This commit is contained in:
+18
-23
@@ -226,19 +226,19 @@ void RenderTerrain()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
// SubmitModelRecursive: recurse down given model, submitting it and all it's descendents to the
|
||||
// renderer
|
||||
void SubmitModelRecursive(CModel* model)
|
||||
{
|
||||
g_Renderer.Submit(model);
|
||||
|
||||
const std::vector<CModel::Prop>& props=model->GetProps();
|
||||
for (uint i=0;i<props.size();i++) {
|
||||
SubmitModelRecursive(props[i].m_Model);
|
||||
}
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
// SubmitModelRecursive: recurse down given model, submitting it and all it's descendents to the
|
||||
// renderer
|
||||
void SubmitModelRecursive(CModel* model)
|
||||
{
|
||||
g_Renderer.Submit(model);
|
||||
|
||||
const std::vector<CModel::Prop>& props=model->GetProps();
|
||||
for (uint i=0;i<props.size();i++) {
|
||||
SubmitModelRecursive(props[i].m_Model);
|
||||
}
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
// RenderModels: iterate through model list and submit all models in viewing frustum to the
|
||||
@@ -249,7 +249,7 @@ void RenderModels()
|
||||
|
||||
const std::vector<CUnit*>& units=g_UnitMan.GetUnits();
|
||||
for (uint i=0;i<units.size();++i) {
|
||||
if (frustum.IsBoxVisible(CVector3D(0,0,0),units[i]->GetModel()->GetBounds())) {
|
||||
if (frustum.IsBoxVisible(CVector3D(0,0,0),units[i]->GetModel()->GetBounds())) {
|
||||
SubmitModelRecursive(units[i]->GetModel());
|
||||
}
|
||||
}
|
||||
@@ -420,17 +420,12 @@ void ParseArgs(int argc, char* argv[])
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" char* _getcwd(char*, int);
|
||||
|
||||
int main(int argc, char* argv[])
|
||||
{
|
||||
const int ERR_MSG_SIZE = 1000;
|
||||
wchar_t err_msg[ERR_MSG_SIZE];
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
lib_init();
|
||||
|
||||
// set 24 bit (float) FPU precision for faster divides / sqrts
|
||||
@@ -440,8 +435,6 @@ int main(int argc, char* argv[])
|
||||
|
||||
detect();
|
||||
|
||||
|
||||
|
||||
// init SDL
|
||||
if(SDL_Init(SDL_INIT_VIDEO|SDL_INIT_TIMER|SDL_INIT_NOPARACHUTE) < 0)
|
||||
{
|
||||
@@ -514,12 +507,16 @@ int main(int argc, char* argv[])
|
||||
debug_warn("SDL_SetGamma failed");
|
||||
}
|
||||
|
||||
|
||||
new CConfig;
|
||||
|
||||
// vfs_mount("gui", "gui", 0);
|
||||
vfs_mount("", "mods/official/", 0);
|
||||
//// dir_add_watch("mods\\official", false);
|
||||
|
||||
|
||||
//Handle xx = tex_load("art/textures/skins/structural/null.png");
|
||||
|
||||
#ifndef NO_GUI
|
||||
// GUI uses VFS, so this must come after VFS init.
|
||||
g_GUI.Initialize();
|
||||
@@ -560,8 +557,6 @@ int main(int argc, char* argv[])
|
||||
g_EntityTemplateCollection.loadTemplates();
|
||||
|
||||
|
||||
|
||||
|
||||
// if no map name specified, load test01.pmp (for convenience during
|
||||
// development. that means loading no map at all is currently impossible.
|
||||
// is that a problem?
|
||||
|
||||
Reference in New Issue
Block a user