diff --git a/FrameTransforms/Rotations/q2au.m b/FrameTransforms/Rotations/q2au.m index eb5d214..a1d8460 100644 --- a/FrameTransforms/Rotations/q2au.m +++ b/FrameTransforms/Rotations/q2au.m @@ -10,13 +10,13 @@ if nargout <= 2 v = q(2:4); - a = 2*atan2(vecnorm(v),q(1)); + a = 2*atan2(vnorm(v),q(1)); u = normvec(v); else s = q(1); % scalar part v = q(2:4); % vector part - [n, N_v] = vecnorm(v); + [n, N_v] = vnorm(v); if isnumeric(n) a = 2*atan2(n,s); else diff --git a/HighLevel/userDataGraph.m b/HighLevel/userDataGraph.m index b2bb751..b27a883 100644 --- a/HighLevel/userDataGraph.m +++ b/HighLevel/userDataGraph.m @@ -37,9 +37,13 @@ % Simulated world % - Simulation landmark sets, playground dimensions +% World = struct(... +% 'points', thickCloister(-6,6,-6,6,1,7),... % 3d point landmarks - see THICKCLOISTER. +% 'segments', []); % 3D segments - see HOUSE. +% [CGGOS] World = struct(... - 'points', thickCloister(-6,6,-6,6,1,7),... % 3d point landmarks - see THICKCLOISTER. - 'segments', []); % 3D segments - see HOUSE. + 'points', thickCloister(-6,6,-6,6,1,7),... + 'segments', house(0,0,0,10,10,8)); % Robot things with their controls % - each robot's type and initial configuration, and controls.