Skip to content

Commit

Permalink
Fix compiler errors for 2.16 core/objects bump
Browse files Browse the repository at this point in the history
  • Loading branch information
JR-Morgan committed Oct 31, 2023
1 parent ee9795e commit 2755a9a
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -357,25 +357,25 @@ public Matrix4x4 TransformToNativeMatrix(STransform speckleTransform)
return new Matrix4x4
{
// Left (X -> X)
[0, 0] = smatrix.M11,
[2, 0] = smatrix.M21,
[1, 0] = smatrix.M31,
[3, 0] = smatrix.M41,
[0, 0] = (float)smatrix.M11,
[2, 0] = (float)smatrix.M21,
[1, 0] = (float)smatrix.M31,
[3, 0] = (float)smatrix.M41,
//Up (Z -> Y)
[0, 2] = smatrix.M12,
[2, 2] = smatrix.M22,
[1, 2] = smatrix.M32,
[3, 2] = smatrix.M42,
[0, 2] = (float)smatrix.M12,
[2, 2] = (float)smatrix.M22,
[1, 2] = (float)smatrix.M32,
[3, 2] = (float)smatrix.M42,
//Forwards (Y -> Z)
[0, 1] = smatrix.M13,
[2, 1] = smatrix.M23,
[1, 1] = smatrix.M33,
[3, 1] = smatrix.M43,
[0, 1] = (float)smatrix.M13,
[2, 1] = (float)smatrix.M23,
[1, 1] = (float)smatrix.M33,
[3, 1] = (float)smatrix.M43,
//Translation
[0, 3] = (float)(smatrix.M14 * sf),
[2, 3] = (float)(smatrix.M24 * sf),
[1, 3] = (float)(smatrix.M34 * sf),
[3, 3] = smatrix.M44,
[3, 3] = (float)smatrix.M44,
};
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,18 @@ public List<Base> ConvertToSpeckle(List<object> objects)
return objects.Select(x => ConvertToNative(x)).ToList();
}

public object ConvertToNativeDisplayable(Base @object)
{
throw new NotImplementedException(
$"{nameof(ConvertToNativeDisplayable)} is not implemented by this converter, use {nameof(ConvertToNative)} instead"
);
}

public bool CanConvertToNativeDisplayable(Base @object)
{
throw new NotImplementedException();
}

public bool CanConvertToSpeckle(object @object)
{
switch (@object)
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 2755a9a

Please sign in to comment.