Brad Davis
03cb6175ab
Support triangle and hexagon shapes, add shape support to overlays.
2016-07-15 22:02:17 -07:00
Zach Pomerantz
694dc1bbf6
Delay Overlays cleanup for scripting
2016-05-09 17:32:25 -07:00
samcake
ad7d567932
Fixing the overlay renderItem access issue
2016-03-10 14:09:34 -08:00
Zach Pomerantz
d1324b2e7a
Merge branch 'master' of github.com:highfidelity/hifi into fix/resort-in-octree
2016-03-08 10:22:25 -08:00
Brad Davis
2f89253dc1
Make Overlays usable from QML
2016-03-04 11:35:54 -08:00
Zach Pomerantz
5995c3717f
Continue updating overlay key on edit
2016-02-26 14:46:42 -08:00
samcake
d3cdc5117f
clean up one more render::Item::isValid(ID)
2016-02-23 11:01:57 -08:00
samcake
1c53f9bc87
Fix the cleanup of the render::Item::ID in the EntityITem Rendereable wich were often not invalidated after beeing removed from the scene. THis caused a bug with particule system when beeing added /removed / updated quickly
2016-02-23 10:40:50 -08:00
Zach Pomerantz
0d29f59e39
Remove drawOnHUD from 3d overlays
2016-02-15 14:04:02 -08:00
Zach Pomerantz
5d1aedf707
Update scene items on overlay3d edits
2016-02-15 13:05:19 -08:00
Brad Davis
e06bc26896
Prevent overlay cleanup from crashing the app
2016-02-11 15:17:58 -08:00
Brad Davis
5b817ccc21
Make all 2D overlays QML
2016-01-28 16:03:26 -08:00
Atlante45
a455cb880f
Fix typeid warning
2015-12-04 09:23:16 -08:00
Atlante45
9827c90851
Rebase fixes
2015-10-06 13:56:24 -07:00
Atlante45
cf3b33a96b
Replace Application::getInstance() with qApp
2015-10-06 13:56:19 -07:00
Brad Davis
aa8979570c
Working on 2D overlay mouse interaction
2015-10-02 00:35:37 -07:00
Brad Hefta-Gaub
430cbcca7e
first cut at adding surface normals to ray intersection
2015-09-27 21:57:50 -07:00
Brad Davis
b6ef2e314f
Adding 'web3d' overlay type
2015-09-02 18:25:49 -07:00
Brad Davis
caf93d1aff
Merge branch 'master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/Menu.h
2015-08-08 13:18:13 -07:00
Zander Otavka
09bb61e4d8
Add backwards compatibility for Image3DOverlays.
...
Using "billboard" to create an Image3DOverlay is deprecated. Instead,
use "image3d" or, even better, use overlayManager.js.
2015-08-07 02:45:05 -07:00
Zander Otavka
be4e827281
Merge: master -> panel-attachable-improvements.
2015-08-06 16:29:38 -07:00
Zander Otavka
497713b020
Rename a few more confusing names.
...
setTransforms -> applyTransformTo
attachedPanel -> parentPanel
2015-08-06 15:45:07 -07:00
Zander Otavka
b94be926f8
Mass renaming to be more logical/concise.
...
FloatingUIPanel -> OverlayPanel
anchorPosition -> position
offsetRotation -> rotation
facingRotation -> offsetRotation
floatingUIExample.js -> overlayPanelExample.js
2015-08-06 14:23:04 -07:00
Bradley Austin Davis
985bdb2190
Fixing merge
2015-08-06 11:52:38 -07:00
Zander Otavka
6165e7e6ca
Improve cross-thread support for panel children.
2015-08-06 11:40:49 -07:00
Bradley Austin Davis
7e60aee1bf
Merge branch 'master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
interface/src/avatar/Head.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/avatar/MyAvatar.h
interface/src/avatar/SkeletonModel.cpp
interface/src/avatar/SkeletonModel.h
interface/src/devices/3DConnexionClient.cpp
interface/src/ui/overlays/Overlays.cpp
2015-08-06 11:03:37 -07:00
Atlante45
3dc8bd47ae
Fix warning and remove unused headers
2015-08-05 16:46:44 -07:00
Zander Otavka
481624b48c
Re-work panel position and rotation binding.
2015-08-05 14:21:23 -07:00
Zander Otavka
22453aa3ce
Improve inner workings of overlay API.
...
More stuff is known to the C++, and a panel object in JavaScript can be
gotten by ID from another thread.
2015-08-04 14:22:21 -07:00
Zander Otavka
055133b82e
Refactor inheritance for billboard overlays.
...
BillboardOverlays is now Image3DOverlay. Billboard3DOverlay is the base
class for both Image3DOverlay and Text3DOverlay, and it is
PanelAttachable.
2015-08-04 14:22:21 -07:00
Sam Gateau
d07ab353fc
remove glLineWidth completely because it s not available anymore for wide lines in core
2015-08-04 11:57:20 -07:00
Zander Otavka
bc5ef8eb11
Clean up C++ relating to panels.
2015-07-31 11:26:04 -07:00
Zander Otavka
da2afca391
Expose overlay type checking to JavaScript.
2015-07-31 11:26:04 -07:00
Zander Otavka
173a79867c
Extend Overlays API to allow for 3D UI panels.
...
Currently, only BillboardOverlays can be added to a panel, but more
types of overlays will be supported in the future.
2015-07-31 11:26:03 -07:00
Brad Davis
8202862750
Working on display plugins stability
2015-07-28 16:22:22 -07:00
Anthony J. Thibault
1d93abf90c
Overlay can be shown and hidden and has better behavior in Standing HMD Mode.
...
Added OverlayConductor class that "orchestrates" Overlays, ApplicationCompositor & AppliationOverlay instances
so that the overlay can be smoothly animated on and off, mouse/key events are blocked when overlay is disabled.
2015-07-23 17:17:03 -07:00
Atlante45
59acfc9f47
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-20 13:51:51 -07:00
Brad Davis
5b494c23fd
More header cleanup
2015-07-18 22:38:26 -07:00
Atlante45
256c786e28
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-17 17:59:19 -07:00
ZappoMan
eb989fd725
fix the backround colors for text overlays, pending austins PR to really fix them
2015-07-17 16:38:05 -07:00
ZappoMan
8692f51399
dead code cleanup
2015-07-17 16:15:02 -07:00
ZappoMan
c20c6e4b90
fix retina in an Austin approved manner
2015-07-17 16:01:32 -07:00
ZappoMan
069620b2d9
hacking on more naked GL
2015-07-16 16:36:48 -07:00
ZappoMan
398075e45a
hacking on more naked GL
2015-07-16 16:26:28 -07:00
ZappoMan
0eeddddd6b
removed naked GL from drawOnHUD overlays.
2015-07-15 09:46:58 -07:00
Sam Gateau
f08c608195
Remove dead code
2015-07-13 16:33:04 -07:00
Sam Gateau
4743bbad80
Adding shaders to the lib for rendering simple textured quad and solve the ImageOverlay issue for edit.js
2015-07-13 16:18:39 -07:00
Atlante45
80fe090a94
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-10 20:20:03 -07:00
Brad Davis
446f800aee
More profiling ranges and updated performance testing scripts
2015-07-09 15:43:30 -07:00
Eric Levin
3d06b011aa
adding batch to renderHUD
2015-07-03 13:27:00 -07:00
