diff options
author | Stijn Buys <ingar@osirion.org> | 2011-01-27 12:36:26 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2011-01-27 12:36:26 +0000 |
commit | 2a87246be478e5ddd2bef4080f36382a889e02dd (patch) | |
tree | d203a9a49044f03764dc2661f688b1c6c836e56d /src/core/gameinterface.cc | |
parent | 45b93da49b74acd7389e4faa1cfd5dba6cd75c95 (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/core/gameinterface.cc')
-rw-r--r-- | src/core/gameinterface.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/core/gameinterface.cc b/src/core/gameinterface.cc index 0a485bc..1d3e6fb 100644 --- a/src/core/gameinterface.cc +++ b/src/core/gameinterface.cc @@ -16,6 +16,7 @@ #include "core/gameinterface.h" #include "core/player.h" #include "core/zone.h" +#include "model/material.h" #include "model/model.h" #include "sys/sys.h" @@ -70,6 +71,7 @@ GameInterface::GameInterface() Func *func = Func::add("list_players", func_list_players); func->set_info("get the local list of connected players"); + // TODO this should be moved back into render size_t mb = (size_t) Cvar::mem_vertex->value(); if (mb < 4 * sizeof(float)) mb = 4 * sizeof(float); @@ -77,6 +79,8 @@ GameInterface::GameInterface() mb = 512; (*Cvar::mem_vertex) = (float) mb; game_vertexarray = new model::VertexArray(mb); + + model::Material::init(); } GameInterface::~GameInterface() @@ -106,8 +110,11 @@ void GameInterface::clear() // remove info records Info::clear(); - // remove all models + // remove models model::Model::clear(); + + // remove materials + model::Material::clear(); // clear player list for (Players::iterator it = game_players.begin(); it != game_players.end(); it++) { |