Commit graph

159 commits

Author SHA1 Message Date
kasenvr
bfd45a0d53
Merge pull request #760 from AleziaKurdis/754_CreateApp_HMD_Improvments
Create App: HMD missing functionalities
2020-10-16 02:06:00 -04:00
Alezia Kurdis
adf6652e24
Put "Cut" before Copy" to be standard
Put "Cut" before Copy" to be standard
2020-10-09 22:14:53 -04:00
kasenvr
89c006d190
Merge pull request #737 from AleziaKurdis/721_entitySelectionTool_to_local_Entities
Replacement of 3D Overlays for Local Entities
2020-10-08 22:49:17 -04:00
Alezia Kurdis
37d694afa0
Minor Code Adjustments
Minor Code Adjustments
2020-10-06 22:05:39 -04:00
Alezia Kurdis
7c9808de40
Minor Code Adjustment
Minor Code Adjustment
2020-10-06 21:52:40 -04:00
Alezia Kurdis
e273c920a4
Minor Code Adjustment
Minor Code Adjustment
2020-10-06 21:50:24 -04:00
Alezia Kurdis
3882aad551
Minor code adjustments
Minor code adjustments
2020-10-06 21:48:23 -04:00
Alezia Kurdis
a7ca92fb9b
Add an audio feedback on Parent/Unparent
Add an audio feedback mechanism
to play confirmation or rejection sound on specific actions that are not visually detectable.
Here for Parent and Unparent (because it not visually detectable in HMD if the action was successful or not)

Fix also a bug where the HMD multiselection could stay active after we return in Desktop mode
Now it is deactivated when the create window are closed.
2020-09-30 23:58:12 -04:00
Alezia Kurdis
1d7f9554ce
Add audio feedback on Duplicate
Add an audio feedback mechanism
to play confirmation or rejection sound on specific actions that are not visually detectable.
here for "Duplicate" (mainly for the HMD use case where the new entity is generated at the exact same position)
2020-09-30 23:55:46 -04:00
Alezia Kurdis
64ad0b5afb
Add audioFeedback mechanism
Add an audio feedback mechanism
to play confirmation or rejection sound on specific actions that are not visually detectable.
- Duplicate (mainly for the HMD use case where the new entity is generated at the exact same position)
- Parent and Unparent (because it not visually detectable in HMD if the action was successful or not)
2020-09-30 23:54:06 -04:00
Alezia Kurdis
ff39a03b5d
Add parent and unparent buttons
Add parent and unparent buttons
2020-09-30 00:44:07 -04:00
Alezia Kurdis
f1f58dcbd4
Add parent and unparent buttons
Add parent and unparent buttons
2020-09-30 00:42:57 -04:00
Alezia Kurdis
16324ace16
Add parent and unparent buttons
Add parent and unparent buttons
2020-09-30 00:42:15 -04:00
Alezia Kurdis
94d030fb5c
Add HmdMultiSelection on inworld Selection
Add HmdMultiSelection on inworld Selection
2020-09-30 00:40:38 -04:00
Alezia Kurdis
2a0d508bb6
Add HmdMultiSelection on inworld Selection
Add HmdMultiSelection on inworld Selection
2020-09-30 00:39:36 -04:00
Alezia Kurdis
427351bcd8
Add a HMD MultiSelect button
Add a HMD MultiSelect button

Since it's impossible in HDM to do a multiple selection 
This adds a MultiSelect button (available in HMD only)
When active, the selection in the list behaves like having CTRL pressed
When inactive (default value) the selection in the list behaves as before (on item only)
2020-09-28 23:13:18 -04:00
Alezia Kurdis
a394b427d4
Add HMD MultiSelect button
Add HMD MultiSelect button
2020-09-28 23:08:48 -04:00
Alezia Kurdis
5047cf338f
HMD: Make the 2 buttons visible without scrolling
HMD: Make the 2 buttons visible without scrolling

In HMD, the 2 buttons:
- Open This Domain's Asset Server
- Import Entities (.json)
were not visible without scrolling. people would not even notice their presence
This fix adjust the spacing and the margin to have the entities button on 2 rows when the UI is in landscape mode
this way the button are visible.
2020-09-28 00:36:42 -04:00
Alezia Kurdis
c2064eed89
Fix a bug about tablet stuck in Landscape
Fix a bug about tablet stuck in Landscape
when the create app was open in desktop and you put your VR Headset on, 
then next time you open the tablet it was in landscape mode. (because a refresh was happening after the landscape set to false at the closure)
Now the condition is geared to deal with the situation.
2020-09-27 23:49:48 -04:00
Alezia Kurdis
3f98cd4934
Fix: Reset Landscape mode in HMD
Fix: Reset Landscape mode in HMD

In HMD, clicking on the button "Open this Domain's Asset server" is reverting the tablet to "portrait" mode
This fix forces the mode to return to Landscape if from the Asset server we click on the "List" tab.
2020-09-27 15:23:17 -04:00
Alezia Kurdis
6ecbbd258b
Fix: Reset Landscape mode in HMD
Fix: Reset Landscape mode in HMD

In HMD, clicking on the button "Open this Domain's Asset server" is reverting the tablet to "portrait" mode
This fix forces the mode to return to Landscape if from the Asset server we click on the "Properties" tab.
2020-09-27 15:22:00 -04:00
kasenvr
87d4fddb40
Merge branch 'master' into feature/transparent-web-entities 2020-09-26 01:25:02 -04:00
Alezia Kurdis
d72f707862
Add the support for HMD buttons
This adds the support for 6 new buttons:
Copy-Cut-Paste-Duplicate-Undo-Redo

It adds the automatic toggling of the HMD only buttons:
Copy-Cut-Paste-Duplicate
2020-09-26 00:55:16 -04:00
Alezia Kurdis
41ef2fafce
Add 6 new buttons
4 buttons for HMD enforce to be hidden by default. (Copy - Cut - Paste - Duplicate)
2 button (Undo and Redo)
2020-09-26 00:50:49 -04:00
Alezia Kurdis
ab45a32fea
Add new button in HMD
Add new button in HMD:
- add undo and redo support
- add HMD detection
2020-09-26 00:46:32 -04:00
Alezia Kurdis
826991d6b4
Code Adjustments and Optimizations
Remove an unused commented const.
Generate all the material using a centralized function, using an array to store the keys. 
Make them deleted by iteration on this array.
Using now defaultFallthrough = true instead of setting albedo to fallthrough.
Replace "materialMappingMode" "projected" for "uv"
Added "ignorePickIntersection": true on the Material entities
2020-09-23 22:28:52 -04:00
Kalila L
ed5a7e82d7 Fix default URLs for edit.js 2020-09-23 01:57:00 -04:00
Kalila L
154a95ac86 Update all scripts, script-archive scripts still broken. 2020-09-22 19:24:58 -04:00
Alezia Kurdis
de21ebf853
Selection Tool "unlit"
This commit includes 2 parts:
1- Re-adjustment in the code to stay aligned with axis/colors/Pitch-Yaw-Roll 
It seems that the Overlay 3dCircle was in fast patch to work while the Gizmo Ring is aligned for Axix versus Pitch-Yaw-Roll.
The modification has been done differently and is in fact a simpler solution.

2- Add a Material local entities parented to each tool entity to make the Selection tool "unlit"
This addresses Issue #709 Enhancement: Make create translate "widget" unlit
BUT there is a known issue: The Gizmo Ring are not supporting the Material currently. (an issue has been open for that see #744)
The Rotation rings are then not "unlit", but everything in the code is ready to support it when it will be done.
Gizmo Ring having practically designed for that specific usage, I think we should keep using them.
Other alternatives like using an image or a model would imply to considerable modifications. 
We would lose the angular representation (that can't be done with image or model). 
The remaining "unlit" issue is very low severity, the widget is still fully functional. So I think it can wait for the support of Material.
2020-09-21 21:59:19 -04:00
Alezia Kurdis
dca2f2e00e
Replacement of 3D Overlays for Local Entities
This replaces all the deprecated 3d Overlays for Local Entities.
No functional changes, only technical.

Many variables have been renamed for clarity. 
(Mainly the term "overlay" that were used to designate the elements of the selection tool. 
Now it refer to "toolEntity" to designate the entities composing the Selection Tool.)

The color of the different elements of the selection tools has also been adjusted.
They are now more contrasted and more vivid.
(The green and the blue of the previous version were too much close at the point that 
some color blind people might have difficulty to differenciate them.)
2020-09-19 23:20:43 -04:00
Dale Glass
0310764013 More review fixes 2020-09-20 01:29:32 +02:00
Dale Glass
cd901f9e32 Move enum into ExternalResources namespace 2020-09-20 01:29:32 +02:00
Dale Glass
c65cc9570d Prototype for moving content away from hifi infrastructure 2020-09-20 01:29:32 +02:00
kasenvr
9fad6109ca
Merge pull request #703 from AleziaKurdis/feature_Create_App_materialData
Feature: Create Material even without a URL.
2020-09-16 23:36:56 -04:00
Alezia Kurdis
6ca176335e
Change "Add" button for "Create"
Change "Add" button for "Create"
2020-09-16 23:15:07 -04:00
Alezia Kurdis
1a0e69ed6e
Change "Add" button for "Create"
Change "Add" button for "Create"
2020-09-16 23:07:41 -04:00
Alezia Kurdis
ec4d559055
Added (Optional) to the label "Material URL"
Added "(Optional)" to the label "Material URL"

"Material URL (Optional)"
2020-09-15 22:24:08 -04:00
Alezia Kurdis
180742f790
Clarify the "materialURL" tooltip
Clarify the "materialURL" tooltip that was a bit obscure.
New value:
"The URL to an external JSON file or "materialData".  Append "?<materialName>" to select a single material if multiple are defined."
2020-09-10 00:15:07 -04:00
Alezia Kurdis
da6a86b411
Create Material without url
This enhancement changes the behavior when a Material Entity is created using the Create App.
Previously, if we left the URL null, no entity was created.
With this fix, if we left the URL null, then the entity is created with "materialData" already set in materialURL (ready to use Material Data).
2020-09-10 00:11:50 -04:00
Alezia Kurdis
6337e84894
Fix for Issue #696
This fixes a refresh of the FILE value in the Create App Entity list when updating the imageURL of an Image Entity.
(It was missing in the condition that checks to add to the refresh of the list.)

This solves the issue #696.
2020-09-09 22:41:05 -04:00
daleglass
aba63051e5
Merge pull request #606 from AleziaKurdis/530_593_CrAppUIadust
Change colorSpread color-picker and other small fixes
2020-08-27 23:30:16 +02:00
Kalila L
26d4eb8e67 Updates per CR.
Co-Authored-By: David Rowe <david@ctrlaltstudio.com>
2020-08-24 18:43:03 -04:00
daleglass
90c957c9e9
Merge pull request #604 from AleziaKurdis/534_601_Default_images
New URL for default Particle and Image resource
2020-08-20 23:26:45 +02:00
Alezia Kurdis
46ca84167c
EOL unix 2020-08-18 23:28:44 -04:00
Alezia Kurdis
92f7e87081
EOL unix 2020-08-18 23:27:47 -04:00
Alezia Kurdis
c6cf0b8c33
New "useBackground" property on Web Entity
New "useBackground" property on Web Entity.
2020-08-18 23:22:39 -04:00
Alezia Kurdis
bda88828a0
Tooltip for useBackground
Tooltip for useBackground
2020-08-18 23:21:32 -04:00
Alezia Kurdis
8d217d215f
Better code fix for preview
being more specific on the validation for the unresolvable relative path.
checking now if the path start with "file:///~" instead of only: "file:/"
This was too much restrictive since those direct path works and wouldn't return a preview:
Ex: "file://MYSERVER/folder/100_0057.jpg"
2020-08-17 21:58:42 -04:00
Alezia Kurdis
341c114adf
Replace default url for external storage
var DEFAULT_IMAGE = "http://eu-central-1.linodeobjects.com/vircadia-assets/interface/default/default_image.jpg";
var DEFAULT_PARTICLE = "http://eu-central-1.linodeobjects.com/vircadia-assets/interface/default/default_particle.png";
2020-08-16 21:58:35 -04:00
Alezia Kurdis
2cd1fc8471
Keep the suffix only for Duplicate
This update removes the incremental suffix from the "Paste"
since this can't really work.
This will be only for "Duplicate".
2020-08-11 22:50:12 -04:00