merge #77

Merged
merged 21 commits into from Oct 17, 2011

Conversation

Projects
None yet
1 participant
Owner

sameeptandon commented Oct 17, 2011

No description provided.

Sameep Tandon and others added some commits Jun 10, 2011

Sameep Tandon Merge pull request #9 from sameeptandon/thread_vision
completing merge
7fe889a
Sameep Tandon Merge pull request #18 from sameeptandon/master
santa cruz code and visualization
a454b83
Sameep Tandon Merge pull request #15 from alexlee-gk/thread_modeling
Thread modeling
3a09baa
Alex Lee camera calibration getting started cc5354a
Sameep Tandon merging 928e959
Alex fixed global variable test_world_manager c96abc2
Alex cleaned up the DiscreteRods directory. removed data files from repo. be18180
Alex Changed implementation of State/Trajectory Recorder/Reader so that mo…
…st of the work is done in the respective classes rather than in testThreadDiscrete_pickUp.cpp. Also, partially cleaned up testThreadDiscrete_pickUp.cpp. Now, the extensions for states/trajectories are the following: (world trajectory, .twd), (control trajectory, .tcl), (world state, .swd).
0fa1443
Alex Added option for creating one thread in World, as it used to be. Adde…
…d collision detection for InfinitePlane, but it doesn't work well, so it's disabled right now.
ab2bdde
Alex fixed merge conflicts c78128e
alexlee-gk Merge pull request #73 from alexlee-gk/thread_modeling
Thread modeling
10c4378
Alex Added getVertices() to ThreadConstrained 2bd6500
Alex better interface for recording/loading trajectories f33ab7e
alexlee-gk Merge pull request #74 from alexlee-gk/thread_modeling
Thread modeling
d88c5db
Alex Control no longer have absolute position and rotation because that do…
…esn't make sense. Also, fixed mayor bug of using control->rotation rather than control->rotate
b000138
Alex forgot to modify ControlToVectorXd so that it does the right thing wi…
…th rotate instead of rotation
d3e1d70
alexlee-gk Merge pull request #75 from alexlee-gk/thread_modeling
Thread modeling
8a3f083
Sameep Tandon Merge remote branch 'upstream/thread_mp' 5a599b8
Sameep Tandon Merge branch 'thread_modeling' 1872c64
Sameep Tandon Merge branch 'thread_vision' 7e28731
Sameep Tandon no cv needed right now b53a601

sameeptandon merged commit 0bc43af into rll:thread_mp Oct 17, 2011

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment