Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 01:24:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1367 from AleziaKurdis/createApp_2025-03_TextEntityLineBreaks
Some checks are pending
Master API-docs CI Build and Deploy / Build and deploy API-docs (push) Waiting to run
Details
Master Doxygen CI Build and Deploy / Build and deploy Doxygen documentation (push) Waiting to run
Details

Browse source 
Create App: Text Entity: Support for line breaks, Replace unlit material entity for shape unlit in selection tool
This commit is contained in:
ksuprynowicz 2025-04-06 19:50:28 +02:00 committed by GitHub
commit 67f90043cf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 25 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/system/create/entityProperties/html/js/entityProperties.js
View file

@ -196,7 +196,7 @@ const GROUPS = [
properties: [
{
label: "Text",
type: "string",
type: "textarea",
propertyID: "text",
},
{

57
scripts/system/create/entitySelectionTool/entitySelectionTool.js
View file

@ -981,7 +981,8 @@ SelectionDisplay = (function() {
primitiveMode: "solid",
visible: false,
ignorePickIntersection: true,
renderLayer: "front"
renderLayer: "front",
unlit: true
};
var handlePropertiesTranslateArrowCylinders = {
type: "Shape",
@ -990,7 +991,8 @@ SelectionDisplay = (function() {
primitiveMode: "solid",
visible: false,
ignorePickIntersection: true,
renderLayer: "front"
renderLayer: "front",
unlit: true
};
var handleTranslateXCone = Entities.addEntity(handlePropertiesTranslateArrowCones, "local");
var handleTranslateXCylinder = Entities.addEntity(handlePropertiesTranslateArrowCylinders, "local");
@ -1005,13 +1007,6 @@ SelectionDisplay = (function() {
Entities.editEntity(handleTranslateZCone, { color: COLOR_BLUE });
Entities.editEntity(handleTranslateZCylinder, { color: COLOR_BLUE });
toolEntityMaterial.push(addUnlitMaterialOnToolEntity(handleTranslateXCone));
toolEntityMaterial.push(addUnlitMaterialOnToolEntity(handleTranslateYCone));
toolEntityMaterial.push(addUnlitMaterialOnToolEntity(handleTranslateZCone));
toolEntityMaterial.push(addUnlitMaterialOnToolEntity(handleTranslateXCylinder));
toolEntityMaterial.push(addUnlitMaterialOnToolEntity(handleTranslateYCylinder));
toolEntityMaterial.push(addUnlitMaterialOnToolEntity(handleTranslateZCylinder));
var handlePropertiesRotateRings = {
type: "Gizmo",
gizmoType: "ring",
@ -1082,7 +1077,7 @@ SelectionDisplay = (function() {
innerStartColor: COLOR_ROTATE_CURRENT_RING,
innerEndColor: COLOR_ROTATE_CURRENT_RING,
outerStartColor: COLOR_ROTATE_CURRENT_RING,
outerEndColor: COLOR_ROTATE_CURRENT_RING,
outerEndColor: COLOR_ROTATE_CURRENT_RING,
},
primitiveMode: "solid",
visible: false,
@ -1117,7 +1112,8 @@ SelectionDisplay = (function() {
primitiveMode: "solid",
visible: false,
ignorePickIntersection: true,
renderLayer: "front"
renderLayer: "front",
unlit: true
};
var handleStretchXCube = Entities.addEntity(handlePropertiesStretchCubes, "local");
@ -1127,10 +1123,6 @@ SelectionDisplay = (function() {
var handleStretchZCube = Entities.addEntity(handlePropertiesStretchCubes, "local");
Entities.editEntity(handleStretchZCube, { color: COLOR_BLUE });
toolEntityMaterial.push(addUnlitMaterialOnToolEntity(handleStretchXCube));
toolEntityMaterial.push(addUnlitMaterialOnToolEntity(handleStretchYCube));
toolEntityMaterial.push(addUnlitMaterialOnToolEntity(handleStretchZCube));
var handlePropertiesStretchPanel = {
type: "Shape",
shape: "Cube",
@ -1138,7 +1130,8 @@ SelectionDisplay = (function() {
alpha: 0.5,
visible: false,
ignorePickIntersection: true,
renderLayer: "front"
renderLayer: "front",
unlit: true
};
var handleStretchXPanel = Entities.addEntity(handlePropertiesStretchPanel, "local");
Entities.editEntity(handleStretchXPanel, { color: COLOR_RED });
@ -1147,22 +1140,18 @@ SelectionDisplay = (function() {
var handleStretchZPanel = Entities.addEntity(handlePropertiesStretchPanel, "local");
Entities.editEntity(handleStretchZPanel, { color: COLOR_BLUE });
toolEntityMaterial.push(addUnlitMaterialOnToolEntity(handleStretchXPanel));
toolEntityMaterial.push(addUnlitMaterialOnToolEntity(handleStretchYPanel));
toolEntityMaterial.push(addUnlitMaterialOnToolEntity(handleStretchZPanel));
var handleScaleCube = Entities.addEntity({
type: "Shape",
shape: "Cube",
primitiveMode: "solid",
primitiveMode: "solid",
dimensions: 0.025,
color: COLOR_SCALE_CUBE,
visible: false,
ignorePickIntersection: true,
renderLayer: "front"
renderLayer: "front",
unlit: true
}, "local");
toolEntityMaterial.push(addUnlitMaterialOnToolEntity(handleScaleCube));
var handleBoundingBox = Entities.addEntity({
type: "Shape",
shape: "Cube",
@ -1171,34 +1160,35 @@ SelectionDisplay = (function() {
color: COLOR_BOUNDING_EDGE,
visible: false,
ignorePickIntersection: true,
renderLayer: "front"
renderLayer: "front",
unlit: true
}, "local");
toolEntityMaterial.push(addUnlitMaterialOnToolEntity(handleBoundingBox));
var handleDuplicator = Entities.addEntity({
type: "Shape",
shape: "Shere",
primitiveMode: "solid",
primitiveMode: "solid",
alpha: 1,
dimensions: 0.05,
color: COLOR_DUPLICATOR,
visible: false,
ignorePickIntersection: true,
renderLayer: "front"
renderLayer: "front",
unlit: true
}, "local");
toolEntityMaterial.push(addUnlitMaterialOnToolEntity(handleDuplicator));
// setting to 0 alpha for now to keep this hidden vs using visible false
// because its used as the translate xz tool handle toolEntity
var selectionBox = Entities.addEntity({
type: "Shape",
shape: "Cube",
primitiveMode: "lines",
primitiveMode: "lines",
dimensions: 1,
color: COLOR_RED,
alpha: 0,
visible: false,
ignorePickIntersection: true
ignorePickIntersection: true,
unlit: true
}, "local");
// Handle for x-z translation of particle effect and light entities while inside the bounding box.
@ -1211,7 +1201,8 @@ SelectionDisplay = (function() {
color: COLOR_RED,
alpha: 0,
visible: false,
ignorePickIntersection: true
ignorePickIntersection: true,
unlit: true
}, "local");
var xRailToolEntity = Entities.addEntity({