Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2011-01-27 12:36:26 +0000
committerStijn Buys <ingar@osirion.org>2011-01-27 12:36:26 +0000
commit2a87246be478e5ddd2bef4080f36382a889e02dd (patch)
treed203a9a49044f03764dc2661f688b1c6c836e56d /src/render
parent45b93da49b74acd7389e4faa1cfd5dba6cd75c95 (diff)
Moved material loading from render to core, make sure the dedicated server reads materials.ini,
removed unnecessary CollisionMesh::translate() method.
Diffstat (limited to 'src/render')
-rw-r--r--src/render/render.cc22
1 files changed, 0 insertions, 22 deletions
diff --git a/src/render/render.cc b/src/render/render.cc
index f24eb83..3d538da 100644
--- a/src/render/render.cc
+++ b/src/render/render.cc
@@ -50,11 +50,6 @@ void func_list_textures(std::string const &args)
Textures::list();
}
-void func_list_materials(std::string const &args)
-{
- model::Material::list();
-}
-
void func_list_particles(std::string const &args)
{
ParticleScript::list();
@@ -141,23 +136,15 @@ void init(int width, int height)
Dust::init();
- // read materials
- model::Material::init();
-
// engine functions
core::Func *func = core::Func::add("list_textures", func_list_textures);
func->set_info("list registered textures");
- func = core::Func::add("list_materials", func_list_materials);
- func->set_info("list registered materials");
-
func = core::Func::add("list_particles", func_list_particles);
func->set_info("list registered particle scripts");
func = core::Func::add("r_loadmodels", func_load_info_models);
func->set_info("load all models referenced by info record");
-
- load();
}
// unload game assets (zone change)
@@ -212,12 +199,6 @@ void clear()
}
}
- // clear model registry
- model::Model::clear();
-
- // clear materials
- model::Material::clear();
-
// clear particle system scripts
ParticleScript::clear();
}
@@ -272,8 +253,6 @@ void reset()
Textures::init();
Dust::reset();
-
- model::Material::init();
}
void resize(int width, int height)
@@ -285,7 +264,6 @@ void shutdown()
{
con_print << "^BShutting down renderer..." << std::endl;
- core::Func::remove("list_materials");
core::Func::remove("list_particles");
core::Func::remove("list_textures");
core::Func::remove("r_loadmodels");