Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-15 21:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

add grid entities to create - icons pending

Browse source
This commit is contained in:
David Back 2019-01-04 18:31:23 -08:00
parent a9bec719d6
commit 9013eee352
8 changed files with 95 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
interface/resources/qml/hifi/tablet/EditTabView.qml
View file

@ -189,6 +189,18 @@ TabBar {
}); });
editTabView.currentIndex = 2 editTabView.currentIndex = 2
} }
}
NewEntityButton {
icon: "icons/create-icons/21-cube-01.svg"
text: "GRID"
onClicked: {
editRoot.sendToScript({
method: "newEntityButtonClicked",
params: { buttonName: "newGridButton" }
});
editTabView.currentIndex = 2
}
} }
} }

12
interface/resources/qml/hifi/tablet/EditToolsTabView.qml
View file

@ -195,6 +195,18 @@ TabBar {
}); });
editTabView.currentIndex = tabIndex.properties editTabView.currentIndex = tabIndex.properties
} }
}
NewEntityButton {
icon: "icons/create-icons/21-cube-01.svg"
text: "GRID"
onClicked: {
editRoot.sendToScript({
method: "newEntityButtonClicked",
params: { buttonName: "newGridButton" }
});
editTabView.currentIndex = tabIndex.properties
}
} }
} }

6
scripts/system/edit.js
View file

@ -893,6 +893,12 @@ var toolBar = (function () {
addButton("newMaterialButton", createNewEntityDialogButtonCallback("Material")); addButton("newMaterialButton", createNewEntityDialogButtonCallback("Material"));
addButton("newGridButton", function () {
createNewEntity({
type: "Grid",
});
});
var deactivateCreateIfDesktopWindowsHidden = function() { var deactivateCreateIfDesktopWindowsHidden = function() {
if (!shouldUseEditTabletApp() && !entityListTool.isVisible() && !createToolsWindow.isVisible()) { if (!shouldUseEditTabletApp() && !entityListTool.isVisible() && !createToolsWindow.isVisible()) {
that.setActive(false); that.setActive(false);

1
scripts/system/html/entityList.html
View file

@ -19,6 +19,7 @@
<script type="text/javascript" src="js/listView.js"></script> <script type="text/javascript" src="js/listView.js"></script>
<script type="text/javascript" src="js/entityListContextMenu.js"></script> <script type="text/javascript" src="js/entityListContextMenu.js"></script>
<script type="text/javascript" src="js/utils.js"></script> <script type="text/javascript" src="js/utils.js"></script>
<script type="text/javascript" src="js/includes.js"></script>
<script type="text/javascript" src="js/entityList.js"></script> <script type="text/javascript" src="js/entityList.js"></script>
</head> </head>
<body onload='loaded();' id="entity-list-body"> <body onload='loaded();' id="entity-list-body">

1
scripts/system/html/entityProperties.html
View file

@ -24,6 +24,7 @@
<script type="text/javascript" src="js/createAppTooltip.js"></script> <script type="text/javascript" src="js/createAppTooltip.js"></script>
<script type="text/javascript" src="js/draggableNumber.js"></script> <script type="text/javascript" src="js/draggableNumber.js"></script>
<script type="text/javascript" src="js/utils.js"></script> <script type="text/javascript" src="js/utils.js"></script>
<script type="text/javascript" src="js/includes.js"></script>
<script type="text/javascript" src="js/entityProperties.js"></script> <script type="text/javascript" src="js/entityProperties.js"></script>
<script src="js/jsoneditor.min.js"></script> <script src="js/jsoneditor.min.js"></script>
</head> </head>

17
scripts/system/html/js/entityList.js
View file

@ -153,22 +153,9 @@ const FILTER_TYPES = [
"PolyLine", "PolyLine",
"PolyVox", "PolyVox",
"Text", "Text",
"Grid",
]; ];
const ICON_FOR_TYPE = {
Shape: "n",
Model: "&#xe008;",
Image: "&#xe02a;",
Light: "p",
Zone: "o",
Web: "q",
Material: "&#xe00b;",
ParticleEffect: "&#xe004;",
PolyLine: "&#xe01b;",
PolyVox: "&#xe005;",
Text: "l",
};
const DOUBLE_CLICK_TIMEOUT = 300; // ms const DOUBLE_CLICK_TIMEOUT = 300; // ms
const RENAME_COOLDOWN = 400; // ms const RENAME_COOLDOWN = 400; // ms
@ -325,7 +312,7 @@ function loaded() {
let elSpan = document.createElement('span'); let elSpan = document.createElement('span');
elSpan.setAttribute("class", "typeIcon"); elSpan.setAttribute("class", "typeIcon");
elSpan.innerHTML = ICON_FOR_TYPE[type]; elSpan.innerHTML = ENTITY_TYPE_ICON[type];
elLabel.insertBefore(elSpan, elLabel.childNodes[0]); elLabel.insertBefore(elSpan, elLabel.childNodes[0]);

52
scripts/system/html/js/entityProperties.js
View file

@ -10,23 +10,6 @@
/* global alert, augmentSpinButtons, clearTimeout, console, document, Element, /* global alert, augmentSpinButtons, clearTimeout, console, document, Element,
EventBridge, JSONEditor, openEventBridge, setTimeout, window, _ $ */ EventBridge, JSONEditor, openEventBridge, setTimeout, window, _ $ */
const ICON_FOR_TYPE = {
Box: "V",
Sphere: "n",
Shape: "n",
ParticleEffect: "&#xe004;",
Model: "&#xe008;",
Web: "q",
Image: "&#xe02a;",
Text: "l",
Light: "p",
Zone: "o",
PolyVox: "&#xe005;",
Multiple: "&#xe000;",
PolyLine: "&#xe01b;",
Material: "&#xe00b;"
};
const DEGREES_TO_RADIANS = Math.PI / 180.0; const DEGREES_TO_RADIANS = Math.PI / 180.0;
const NO_SELECTION = ","; const NO_SELECTION = ",";
@ -44,7 +27,7 @@ const GROUPS = [
{ {
label: NO_SELECTION, label: NO_SELECTION,
type: "icon", type: "icon",
icons: ICON_FOR_TYPE, icons: ENTITY_TYPE_ICON,
propertyID: "type", propertyID: "type",
replaceID: "placeholder-property-type", replaceID: "placeholder-property-type",
}, },
@ -662,6 +645,38 @@ const GROUPS = [
propertyID: "materialRepeat", propertyID: "materialRepeat",
}, },
] ]
},
{
id: "grid",
addToGroup: "base",
properties: [
{
label: "Color",
type: "color",
propertyID: "color",
},
{
label: "Follow Camera",
type: "bool",
propertyID: "followCamera",
},
{
label: "Major Grid Every",
type: "number-draggable",
min: 0,
step: 1,
decimals: 0,
propertyID: "majorGridEvery",
},
{
label: "Minor Grid Every",
type: "number-draggable",
min: 0,
step: 0.01,
decimals: 2,
propertyID: "minorGridEvery",
},
]
}, },
{ {
id: "particles", id: "particles",
@ -1427,6 +1442,7 @@ const GROUPS_PER_TYPE = {
'particles_acceleration', 'particles_spin', 'particles_constraints', 'spatial', 'behavior', 'physics' ], 'particles_acceleration', 'particles_spin', 'particles_constraints', 'spatial', 'behavior', 'physics' ],
PolyLine: [ 'base', 'spatial', 'behavior', 'collision', 'physics' ], PolyLine: [ 'base', 'spatial', 'behavior', 'collision', 'physics' ],
PolyVox: [ 'base', 'spatial', 'behavior', 'collision', 'physics' ], PolyVox: [ 'base', 'spatial', 'behavior', 'collision', 'physics' ],
Grid: [ 'base', 'grid', 'spatial', 'behavior', 'physics' ],
Multiple: [ 'base', 'spatial', 'behavior', 'collision', 'physics' ], Multiple: [ 'base', 'spatial', 'behavior', 'collision', 'physics' ],
}; };

27
scripts/system/html/js/includes.js Normal file
View file

@ -0,0 +1,27 @@
//
// includes.js
//
// Created by David Back on 3 Jan 2019
// Copyright 2016 High Fidelity, Inc.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
const ENTITY_TYPE_ICON = {
Box: "m",
Grid: "V",
Image: "&#xe02a;",
Light: "p",
Material: "&#xe00b;",
Model: "&#xe008;",
ParticleEffect: "&#xe004;",
PolyVox: "&#xe005;",
PolyLine: "&#xe01b;",
Shape: "n",
Sphere: "n",
Text: "l",
Web: "q",
Zone: "o",
Multiple: "&#xe000;",
};