use new TransformState object

This commit is contained in:
David Rose 2003-01-15 17:38:52 +00:00
parent d260b486a7
commit b14b4e53de
2 changed files with 6 additions and 5 deletions

View File

@ -30,9 +30,9 @@ TrackerNode::
TrackerNode(ClientBase *client, const string &device_name) : TrackerNode(ClientBase *client, const string &device_name) :
DataNode(device_name) DataNode(device_name)
{ {
_transform_output = define_output("transform", EventStoreMat4::get_class_type()); _transform_output = define_output("transform", EventStoreTransform::get_class_type());
_transform = new EventStoreMat4(LMatrix4f::ident_mat()); _transform = new EventStoreTransform(TransformState::make_identity());
nassertv(client != (ClientBase *)NULL); nassertv(client != (ClientBase *)NULL);
set_tracker_coordinate_system(client->get_coordinate_system()); set_tracker_coordinate_system(client->get_coordinate_system());
@ -97,8 +97,9 @@ do_transmit_data(const DataNodeTransmit &, DataNodeTransmit &output) {
} }
_mat.set_row(3, _data.get_pos()); _mat.set_row(3, _data.get_pos());
// Now send our matrix down the pipe. // Now send our matrix down the pipe. TODO: store this
_transform->set_value(_mat); // componentwise instead of just as a matrix-based transform.
_transform->set_value(TransformState::make_mat(_mat));
output.set_data(_transform_output, EventParameter(_transform)); output.set_data(_transform_output, EventParameter(_transform));
} }
} }

View File

@ -63,7 +63,7 @@ private:
// outputs // outputs
int _transform_output; int _transform_output;
PT(EventStoreMat4) _transform; PT(EventStoreTransform) _transform;
private: private:
PT(ClientTrackerDevice) _tracker; PT(ClientTrackerDevice) _tracker;