diff --git a/HiVRClient.Test/Model/DrawableModel/DrawableFactoryTest.cs b/HiVRClient.Test/Model/DrawableModel/DrawableFactoryTest.cs index 533f8a2..11b85b3 100644 --- a/HiVRClient.Test/Model/DrawableModel/DrawableFactoryTest.cs +++ b/HiVRClient.Test/Model/DrawableModel/DrawableFactoryTest.cs @@ -187,8 +187,8 @@ public void TestGetPatient() Assert.That(res.Position.Z, Is.EqualTo(Patient.DefaultPosition.Z + this.vector.Z)); Assert.That(res.Rotation.X, Is.EqualTo(Patient.DefaultRotation.X)); - Assert.That(res.Rotation.Y, Is.EqualTo(Patient.DefaultRotation.Y + this.vector.Y)); - Assert.That(res.Rotation.Z, Is.EqualTo(Patient.DefaultRotation.Z + this.vector.Z)); + Assert.That(res.Rotation.Y, Is.EqualTo(-(Patient.DefaultRotation.Y + this.vector.Y))); + Assert.That(res.Rotation.Z, Is.EqualTo(-(Patient.DefaultRotation.Z + this.vector.Z))); Assert.That(res.Scale.X, Is.EqualTo(0D)); Assert.That(res.Scale.Y, Is.EqualTo(Patient.DefaultScale.Y)); diff --git a/HiVRClient/Model/DrawableModel/DrawableFactory.cs b/HiVRClient/Model/DrawableModel/DrawableFactory.cs index e1a9e94..d7acdf8 100644 --- a/HiVRClient/Model/DrawableModel/DrawableFactory.cs +++ b/HiVRClient/Model/DrawableModel/DrawableFactory.cs @@ -126,7 +126,7 @@ public Character GetCharacter(int id, Vector3D position, Vector3D rotation, Vect public Patient GetPatient(int id, Vector3D position, Vector3D rotation, Vector3D scale) { var correctedPosition = this.AddIndividuals(position, Patient.DefaultPosition); - var correctedRotation = this.AddIndividuals(rotation, Patient.DefaultRotation); + var correctedRotation = this.AddIndividuals(-rotation, Patient.DefaultRotation); var correctedScale = this.MultiplyIndividuals(scale, Patient.DefaultScale); return new Patient(id, correctedPosition, correctedRotation, correctedScale); diff --git a/HiVRClient/View/DrawableTemplate.xaml b/HiVRClient/View/DrawableTemplate.xaml index ce78439..65b1a30 100644 --- a/HiVRClient/View/DrawableTemplate.xaml +++ b/HiVRClient/View/DrawableTemplate.xaml @@ -191,13 +191,10 @@ - - + +