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>2012-11-25 12:06:13 +0000
committerStijn Buys <ingar@osirion.org>2012-11-25 12:06:13 +0000
commitd8be908233fd7b85492d7a9e87f07bb207173990 (patch)
tree70d9103a867688838fc517290bb370366c69fedb /src/model/model.h
parentedc5ddce817244111b302e449c28a052f2746cc4 (diff)
Moved core::EntityGlobe into a separate file,
added various methods to core::Item and core::Slot, added r_slots cvar to draw entity slots and docks, added game methods for mounting and umounting of weapons, added playerlist to chat window.
Diffstat (limited to 'src/model/model.h')
-rw-r--r--src/model/model.h20
1 files changed, 13 insertions, 7 deletions
diff --git a/src/model/model.h b/src/model/model.h
index a33e365..3c94ad6 100644
--- a/src/model/model.h
+++ b/src/model/model.h
@@ -74,11 +74,15 @@ public:
return model_radius;
}
- /// additional model fragment groups
+ /// print information about the model to console
+ void print() const;
+
+ /// model fragment groups
inline Groups & groups() {
return model_groups;
}
+ /// associated collisionmodel
inline CollisionModel *collisionmodel() {
return model_collisionmodel;
}
@@ -191,10 +195,16 @@ public:
return model_registry;
}
- /// get name model, returns 0 if not found
+ /// search the model registry
static Model *find(const std::string & name);
+
+ /// search the model registry for a partial name
+ static Model *search(const std::string & searchname);
- /// get named model from the registry and load it if necessary
+ /**
+ * @brief load a model
+ * If the model has already been loaded, a pointer to the existing instance will be returned
+ * */
static Model *load(const std::string & name);
/// clear the model registry
@@ -203,10 +213,6 @@ public:
/// list the content of the model registry
static void list();
- /// list one model
- static void list_model(Model *model);
-
-
private:
std::string model_name;
Docks model_docks;