diff --git a/vr-configurator/Assets/Scripts/Models/ModelBehaviour.cs b/vr-configurator/Assets/Scripts/Models/ModelBehaviour.cs index 24f5ba7..62ba4aa 100644 --- a/vr-configurator/Assets/Scripts/Models/ModelBehaviour.cs +++ b/vr-configurator/Assets/Scripts/Models/ModelBehaviour.cs @@ -103,8 +103,8 @@ public class ModelBehaviour : MonoBehaviour, IResettable if (Model != null) { Debug.Log($"UpdateModel: Model {name} reset old {Model} offsets."); - transform.localPosition -= Model.Offset; transform.localRotation *= Quaternion.Inverse(Model.Rotation); + transform.localPosition -= Model.Offset; transform.localScale -= Model.Scale; } diff --git a/vr-configurator/Assets/Scripts/Models/Port.cs b/vr-configurator/Assets/Scripts/Models/Port.cs index f53b10c..fde14ec 100644 --- a/vr-configurator/Assets/Scripts/Models/Port.cs +++ b/vr-configurator/Assets/Scripts/Models/Port.cs @@ -22,8 +22,8 @@ public class Port public void Apply(Transform target) { //Debug.Log($"Applying port {target.gameObject.name} pos {target.localPosition} {target.localRotation} {target.localScale}"); - target.localPosition += _position; target.localRotation *= _rotation; + target.localPosition += _position; target.localScale *= _scale; //Debug.Log($"applied port {target.gameObject.name} pos {target.localPosition} {target.localRotation} {target.localScale}"); } @@ -31,8 +31,8 @@ public class Port public void Unapply(Transform target) { Debug.Log($"Unapplying port {target.gameObject.name} pos {target.localPosition} {target.localRotation} {target.localScale}"); - target.localPosition -= _position; target.localRotation *= Quaternion.Inverse(_rotation); + target.localPosition -= _position; target.localScale /= _scale; Debug.Log($"unapplied port {target.gameObject.name} pos {target.localPosition} {target.localRotation} {target.localScale}"); } diff --git a/vr-configurator/Assets/Scripts/Models/PortDef.cs b/vr-configurator/Assets/Scripts/Models/PortDef.cs index bc2a7c0..c61d512 100644 --- a/vr-configurator/Assets/Scripts/Models/PortDef.cs +++ b/vr-configurator/Assets/Scripts/Models/PortDef.cs @@ -112,7 +112,7 @@ public class PortDef public const string ERL_LP_TC = "erlLPpickableu"; public const string ERL_LP_TEXT = "erlLPText89"; public const string ERL_LP_COUNTRY = "erlLPCountry90"; - public const string ERL_GRILL = "portErlbach91"; + public const string ERL_GRILL = "erlGrill"; public const string ERL_DRL_OUTLINE = "erlDRLoutline"; //Daytime running lights public const string ERL_DRL_PLATE = "erlDRLplate"; public const string ERL_WINDOW = "erlWindow";