From d35cbcaf98deae51d072001b96d5b099d5c5e7fd Mon Sep 17 00:00:00 2001
From: Daan Vanden Bosch <daan.v.d.bosch@gmail.com>
Date: Thu, 24 Sep 2020 20:25:15 +0200
Subject: [PATCH] Object-specific property values of type angle are now
 displayed in degrees instead of radians. Fixed the types of some
 object-specific properties.

---
 .../parsing/quest/object_types.ts             |  4 +--
 src/quest_editor/gui/EntityInfoView.ts        | 31 +++++++++++++------
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/core/data_formats/parsing/quest/object_types.ts b/src/core/data_formats/parsing/quest/object_types.ts
index 06cbb54a..4110cc90 100644
--- a/src/core/data_formats/parsing/quest/object_types.ts
+++ b/src/core/data_formats/parsing/quest/object_types.ts
@@ -958,7 +958,7 @@ define_object_type_data(
         ["Destination x", 40, "F32"],
         ["Destination y", 44, "F32"],
         ["Destination z", 48, "F32"],
-        ["Dst. rotation y", 52, "I32"],
+        ["Dst. rotation y", 52, "Angle"],
     ],
 );
 define_object_type_data(
@@ -2288,7 +2288,7 @@ define_object_type_data(
         ["Destination x", 40, "F32"],
         ["Destination y", 44, "F32"],
         ["Destination z", 48, "F32"],
-        ["Dst. rotation y", 52, "I32"],
+        ["Dst. rotation y", 52, "Angle"],
     ],
 );
 define_object_type_data(
diff --git a/src/quest_editor/gui/EntityInfoView.ts b/src/quest_editor/gui/EntityInfoView.ts
index 468a008f..50d01e95 100644
--- a/src/quest_editor/gui/EntityInfoView.ts
+++ b/src/quest_editor/gui/EntityInfoView.ts
@@ -2,7 +2,7 @@ import { bind_attr, bind_children_to, div, table, td, th, tr } from "../../core/
 import { UnavailableView } from "./UnavailableView";
 import "./EntityInfoView.css";
 import { NumberInput } from "../../core/gui/NumberInput";
-import { rad_to_deg } from "../../core/math";
+import { deg_to_rad, rad_to_deg } from "../../core/math";
 import { EntityInfoController } from "../controllers/EntityInfoController";
 import { ResizableView } from "../../core/gui/ResizableView";
 import { QuestEntityPropModel } from "../model/QuestEntityPropModel";
@@ -148,8 +148,8 @@ export class EntityInfoView extends ResizableView {
                 max = 0x7fffffff;
                 break;
             case EntityPropType.Angle:
-                min = -2 * Math.PI;
-                max = 2 * Math.PI;
+                min = -360;
+                max = 360;
                 break;
         }
 
@@ -157,16 +157,27 @@ export class EntityInfoView extends ResizableView {
             prop.type === EntityPropType.F32 || prop.type === EntityPropType.Angle ? 3 : 1;
 
         const value_input = disposer.add(
-            new NumberInput(prop.value.val, {
-                min,
-                max,
-                round_to,
-            }),
+            new NumberInput(
+                prop.type === EntityPropType.Angle ? rad_to_deg(prop.value.val) : prop.value.val,
+                {
+                    min,
+                    max,
+                    round_to,
+                },
+            ),
         );
 
         disposer.add_all(
-            value_input.value.bind_to(prop.value),
-            value_input.value.observe(({ value }) => this.ctrl.set_prop_value(prop, value)),
+            value_input.value.bind_to(
+                prop.type === EntityPropType.Angle ? prop.value.map(rad_to_deg) : prop.value,
+            ),
+
+            value_input.value.observe(({ value }) =>
+                this.ctrl.set_prop_value(
+                    prop,
+                    prop.type === EntityPropType.Angle ? deg_to_rad(value) : value,
+                ),
+            ),
         );
 
         const element = tr(th(`${prop.name}:`), td(value_input.element));