Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/model/collisionmesh.cc')
-rw-r--r--src/model/collisionmesh.cc20
1 files changed, 13 insertions, 7 deletions
diff --git a/src/model/collisionmesh.cc b/src/model/collisionmesh.cc
index 808da63..0bb6580 100644
--- a/src/model/collisionmesh.cc
+++ b/src/model/collisionmesh.cc
@@ -32,7 +32,12 @@ CollisionMesh::CollisionMesh(const CollisionMesh &other)
collisionmesh_scale = other.scale();
collisionmesh_speed = other.speed();
collisionmesh_distance = other.distance();
+
+ collisionmesh_location.assign(other.location());
+ collisionmesh_axis.assign(other.axis());
+ collisionmesh_movement.assign(other.movement());
}
+
CollisionMesh::~CollisionMesh()
{
if (collisionmesh_owns_triangles)
@@ -41,14 +46,15 @@ CollisionMesh::~CollisionMesh()
collisionmesh_triangles = 0;
}
-void CollisionMesh::set_params(const FragmentGroup *group)
+void CollisionMesh::set_params(const FragmentGroup & group)
{
- collisionmesh_type = group->type();
- collisionmesh_location.assign(group->location());
- collisionmesh_axis.assign(group->axis());
- collisionmesh_scale = group->scale();
- collisionmesh_speed = group->speed();
- collisionmesh_distance = group->distance();
+ collisionmesh_type = group.type();
+ collisionmesh_location.assign(group.location());
+ collisionmesh_axis.assign(group.axis());
+ collisionmesh_movement.assign(group.movement());
+ collisionmesh_scale = group.scale();
+ collisionmesh_speed = group.speed();
+ collisionmesh_distance = group.distance();
}