From 3a821c2b7448175d32d17cfc321fca7f8b9e91f3 Mon Sep 17 00:00:00 2001
From: HifiExperiments <thingsandstuffblog@gmail.com>
Date: Mon, 18 Jan 2021 11:23:44 -0800
Subject: [PATCH] update create

---
 .../create/assets/data/createAppTooltips.json | 15 ++-------
 .../html/js/entityProperties.js               | 31 ++++++-------------
 2 files changed, 13 insertions(+), 33 deletions(-)

diff --git a/scripts/system/create/assets/data/createAppTooltips.json b/scripts/system/create/assets/data/createAppTooltips.json
index 478793ab78..edfdad037b 100644
--- a/scripts/system/create/assets/data/createAppTooltips.json
+++ b/scripts/system/create/assets/data/createAppTooltips.json
@@ -38,10 +38,6 @@
     "textEffectThickness": {
         "tooltip": "The magnitude of the text effect."
     },
-    "textBillboardMode": {
-        "tooltip": "If enabled, determines how the entity will face the camera.",
-        "jsPropertyName": "billboardMode"
-    },
     "topMargin": {
         "tooltip": "The top margin, in meters."
     },
@@ -223,10 +219,6 @@
     "subImage": {
         "tooltip": "The area of the image that is displayed."
     },
-    "imageBillboardMode": {
-        "tooltip": "If enabled, determines how the entity will face the camera.",
-        "jsPropertyName": "billboardMode"
-    },
     "keepAspectRatio": {
         "tooltip": "If enabled, the image will maintain its original aspect ratio."
     },
@@ -236,10 +228,6 @@
     "dpi": {
         "tooltip": "The resolution to display the page at, in pixels per inch. Use this to resize your web source in the frame."
     },
-    "webBillboardMode": {
-        "tooltip": "If enabled, determines how the entity will face the camera.",
-        "jsPropertyName": "billboardMode"
-    },
     "inputMode": {
         "tooltip": "The user input mode to use."
     },
@@ -595,6 +583,9 @@
     "primitiveMode": {
         "tooltip": "The mode in which to draw an entity, either \"Solid\" or \"Wireframe\"."
     },
+    "billboardMode": {
+        "tooltip": "Determines if and how the entity will face the camera.",
+    },
     "renderWithZones": {
         "tooltip": "If set, this entity will only render when your avatar is inside of a zone in this list."
     },
diff --git a/scripts/system/create/entityProperties/html/js/entityProperties.js b/scripts/system/create/entityProperties/html/js/entityProperties.js
index f3f92a887e..5f39cdfd45 100644
--- a/scripts/system/create/entityProperties/html/js/entityProperties.js
+++ b/scripts/system/create/entityProperties/html/js/entityProperties.js
@@ -116,6 +116,16 @@ const GROUPS = [
                 },
                 propertyID: "primitiveMode",
             },
+            {
+                label: "Billboard Mode",
+                type: "dropdown",
+                options: {
+                    none: "None",
+                    yaw: "Yaw",
+                    full: "Full"
+                },
+                propertyID: "billboardMode",
+            },
             {
                 label: "Render With Zones",
                 type: "multipleZonesSelection",
@@ -229,13 +239,6 @@ const GROUPS = [
                 decimals: 2,
                 propertyID: "textEffectThickness",
             },
-            {
-                label: "Billboard Mode",
-                type: "dropdown",
-                options: { none: "None", yaw: "Yaw", full: "Full"},
-                propertyID: "textBillboardMode",
-                propertyName: "billboardMode", // actual entity property name
-            },
             {
                 label: "Top Margin",
                 type: "number-draggable",
@@ -718,13 +721,6 @@ const GROUPS = [
                 subLabels: [ "x", "y", "w", "h" ],
                 propertyID: "subImage",
             },
-            {
-                label: "Billboard Mode",
-                type: "dropdown",
-                options: { none: "None", yaw: "Yaw", full: "Full"},
-                propertyID: "imageBillboardMode",
-                propertyName: "billboardMode", // actual entity property name
-            },
             {
                 label: "Keep Aspect Ratio",
                 type: "bool",
@@ -774,13 +770,6 @@ const GROUPS = [
                 decimals: 0,
                 propertyID: "maxFPS",
             },
-            {
-                label: "Billboard Mode",
-                type: "dropdown",
-                options: { none: "None", yaw: "Yaw", full: "Full"},
-                propertyID: "webBillboardMode",
-                propertyName: "billboardMode", // actual entity property name
-            },
             {
                 label: "Input Mode",
                 type: "dropdown",