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-03-27 15:19:19 +0000
committerStijn Buys <ingar@osirion.org>2011-03-27 15:19:19 +0000
commit6c2075993d68dbacf011756508f957cea1bde845 (patch)
treec97f2707eb5d36ee33a785139f6ce9e1eb8272a1 /src/model/fragment.h
parentbf84493becfe1a08e9cb906fb85c7268c3a6c910 (diff)
Corrected rotating fragmentgroups imported from submodels.
Diffstat (limited to 'src/model/fragment.h')
-rw-r--r--src/model/fragment.h19
1 files changed, 10 insertions, 9 deletions
diff --git a/src/model/fragment.h b/src/model/fragment.h
index 58ff4bb..db5f569 100644
--- a/src/model/fragment.h
+++ b/src/model/fragment.h
@@ -98,6 +98,10 @@ public:
return group_location;
}
+ inline const math::Vector3f &movement() const {
+ return group_movement;
+ }
+
inline const math::Axis & axis() const {
return group_axis;
}
@@ -114,10 +118,6 @@ public:
return group_scale;
}
- inline const bool transform() const {
- return group_transform;
- }
-
inline const bool engine() const {
return group_engine;
}
@@ -143,6 +143,11 @@ public:
inline void set_location(const math::Vector3f &location) {
group_location.assign(location);
}
+
+ inline void set_movement(const math::Vector3f &movement) {
+ group_movement.assign(movement);
+ }
+
/**
* @brief rotation axis
@@ -171,10 +176,6 @@ public:
group_scale = scale;
}
- inline void set_transform(const bool transform) {
- group_transform = transform;
- }
-
inline void add_fragment(Fragment *fragment) {
group_fragments.push_back(fragment);
}
@@ -191,8 +192,8 @@ private:
float group_scale;
float group_distance;
- bool group_transform;
bool group_engine;
+ math::Vector3f group_movement;
};
}