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>2010-10-24 22:22:34 +0000
committerStijn Buys <ingar@osirion.org>2010-10-24 22:22:34 +0000
commitfa852cfee26d3bdff0e18589ffb00851b0c25775 (patch)
tree45c2308424e77508fc79708932b5f163ec2992d9 /src/model/model.h
parenta704318f507f486ac04834747eb209d0a9410702 (diff)
corrects model bounding box issues
Diffstat (limited to 'src/model/model.h')
-rw-r--r--src/model/model.h17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/model/model.h b/src/model/model.h
index dd9cdf2..287b0cf 100644
--- a/src/model/model.h
+++ b/src/model/model.h
@@ -125,12 +125,12 @@ public:
inline const math::Color & enginecolor() const {
return model_enginecolor;
}
-
- /// original origin
+
+ /// original model origin
inline const math::Vector3f & origin() const {
return model_origin;
}
-
+
/// add a light tag to the model
void add_light(Light *light);
@@ -149,10 +149,13 @@ public:
/// add a fragment group to the model
void add_group(FragmentGroup *group);
+ /// set model radius
void set_radius(const float radius);
-
+
+ /// set model origin
void set_origin(const math::Vector3f &origin);
-
+
+ math::Vector3f model_origin;
math::Vector3f model_maxbbox;
math::Vector3f model_minbbox;
@@ -195,17 +198,13 @@ public:
private:
std::string model_name;
-
Docks model_docks;
Flares model_flares;
Sounds model_sounds;
Lights model_lights;
ParticleSystems model_particles;
Groups model_groups;
-
- math::Vector3f model_origin;
float model_radius;
-
static Registry model_registry;
};