From 8952a44da4f2f7b3f72cf74847c0b2bc6d42ad78 Mon Sep 17 00:00:00 2001 From: Alezia Kurdis <60075796+AleziaKurdis@users.noreply.github.com> Date: Fri, 4 Nov 2022 22:39:39 -0400 Subject: [PATCH 1/2] Add the missing tooltip for the Polyvox properties Add the missing tooltip for the Polyvox properties --- .../create/assets/data/createAppTooltips.json | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/scripts/system/create/assets/data/createAppTooltips.json b/scripts/system/create/assets/data/createAppTooltips.json index 4884cb3930..9f6c3ef278 100644 --- a/scripts/system/create/assets/data/createAppTooltips.json +++ b/scripts/system/create/assets/data/createAppTooltips.json @@ -663,5 +663,24 @@ "importNewEntity": { "tooltip": "Import a local or hosted file that can be used across domains.", "skipJSProperty": true + }, + "voxelVolumeSize": { + "tooltip": "Number of voxels along each axis of the entity." + }, + "polyVoxPreset": { + "tooltip": "Apply a predefined set of textures to the PolyVox entity, replacing the url of the properties: X Texture URL, Y Texture URL, Z Texture URL.", + "skipJSProperty": true + }, + "voxelSurfaceStyle": { + "tooltip": "The style of rendering the voxels' surface and how neighboring PolyVox entities are joined." + }, + "xTextureURL": { + "tooltip": "The URL of the texture to map to surfaces perpendicular to the entity's local x-axis. JPG or PNG format." + }, + "yTextureURL": { + "tooltip": "The URL of the texture to map to surfaces perpendicular to the entity's local y-axis. JPG or PNG format." + }, + "zTextureURL": { + "tooltip": "The URL of the texture to map to surfaces perpendicular to the entity's local z-axis. JPG or PNG format." } } From 25d78b43c37ce81fedfcc2cee5984859c9d15567 Mon Sep 17 00:00:00 2001 From: Alezia Kurdis <60075796+AleziaKurdis@users.noreply.github.com> Date: Fri, 4 Nov 2022 22:43:31 -0400 Subject: [PATCH 2/2] Move the Polyvox property "Texture preset" Move the Polyvox property "Texture preset" over the 3 texture properties that it affects. --- .../entityProperties/html/js/entityProperties.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/system/create/entityProperties/html/js/entityProperties.js b/scripts/system/create/entityProperties/html/js/entityProperties.js index 5038d3dce5..037a85a7b5 100644 --- a/scripts/system/create/entityProperties/html/js/entityProperties.js +++ b/scripts/system/create/entityProperties/html/js/entityProperties.js @@ -1342,6 +1342,14 @@ const GROUPS = [ unit: "", propertyID: "voxelVolumeSize", }, + { + label: "Surface Style", + type: "dropdown", + options: { 0: "Marching cubes", 1: "Cubic", + 2: "Edged cubic", 3: "Edged marching cubes" }, + propertyID: "voxelSurfaceStyle", + propertyName: "voxelSurfaceStyle", + }, { label: "Texture preset", type: "dropdown", @@ -1351,14 +1359,6 @@ const GROUPS = [ onDropdownChange: createPolyVoxPresetChangedFunction, skipPropertyUpdate: true, }, - { - label: "Surface Style", - type: "dropdown", - options: { 0: "Marching cubes", 1: "Cubic", - 2: "Edged cubic", 3: "Edged marching cubes" }, - propertyID: "voxelSurfaceStyle", - propertyName: "voxelSurfaceStyle", - }, { label: "X Texture URL", type: "string",