[AdgDim] Using matrix instead of org and angle