Skip to content

Fix illegal module insertion bug #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kazogihara wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix illegal module insertion bug #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions simulatorCore/src/robots/catoms3D/catoms3DBlock.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,11 @@ const float tabOrientationAngles[12][3] = { {0,0,0}, {180.0f,0.0f,-90.0f}, {-90.
tabConnectorPositions[i] : coordinates of connector #i

*/
const float tabConnectorPositions[12][3] = { {1,0,0}, {0,1,0}, {0.5,0.5,M_SQRT2_2},
const float tabConnectorPositions[13][3] = { {1,0,0}, {0,1,0}, {0.5,0.5,M_SQRT2_2},
{-0.5,0.5,M_SQRT2_2},{-0.5,-0.5,M_SQRT2_2},{0.5,-0.5,M_SQRT2_2},
{-1,0,0}, {0,-1,0}, {-0.5,-0.5,-M_SQRT2_2},
{0.5,-0.5,-M_SQRT2_2},{0.5,0.5,-M_SQRT2_2},{-0.5,0.5,-M_SQRT2_2}};
{0.5,-0.5,-M_SQRT2_2},{0.5,0.5,-M_SQRT2_2},{-0.5,0.5,-M_SQRT2_2},
{0,0,0}};

class Catoms3DBlockCode;

Expand Down
1 change: 1 addition & 0 deletions simulatorCore/src/robots/catoms3D/catoms3DWorld.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,7 @@ void Catoms3DWorld::setSelectedFace(int n) {
else if (name == "Material__78") numSelectedFace = 9;
else if (name == "Material__69") numSelectedFace = 10;
else if (name == "Material__70") numSelectedFace = 11;
else if (name == "Material__79") numSelectedFace = 12;
else {
// cerr << "warning: Unrecognized picking face" << endl;
numSelectedFace = 13; // UNDEFINED
Expand Down