Commit graph

259 commits

Author SHA1 Message Date
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
Atlante45
ee13407066 Fix smart pointer casts 2015-07-01 19:22:40 -07:00
Atlante45
233d92c315 Some code cleanup 2015-06-24 15:44:47 -07:00
Atlante45
c22f1aa7e1 Overlay2D return correct getBounds 2015-06-24 15:44:46 -07:00
Brad Davis
00d8fe75ab Breaking up overlay into rendering and compositing classes 2015-06-13 17:36:08 -07:00
ZappoMan
4438263014 more hacking on overlay build busters 2015-06-03 20:46:59 -07:00
ZappoMan
7fde574a2a make model overlays acutally use sub mesh payload items 2015-06-03 16:33:58 -07:00
Ryan Huffman
b37a023041 Remove all overlays from Scene on desctruction 2015-05-29 14:55:53 -07:00
Ryan Huffman
667dccbb87 Add Item::INVALID_ITEM_ID and use in overlays 2015-05-29 13:43:49 -07:00
Ryan Huffman
b4806f5aac Fix render::PendingChanges using render::Scene::PendingChanges 2015-05-29 09:40:52 -07:00
Ryan Huffman
0e5cf273ab Fix AABox bounds handling in Overlays 2015-05-29 09:40:23 -07:00
Ryan Huffman
2222468e89 Remove Overlays::renderWorld 2015-05-29 08:53:40 -07:00
Ryan Huffman
1089490658 Move overlay rendering to Scene 2015-05-29 08:51:25 -07:00
Ryan Huffman
3f22b5f8b3 Add RenderArgs to more render methods 2015-05-22 15:25:53 -07:00
Bradley Austin Davis
03bd17ed49 Rebasing onto scale changes 2015-05-08 15:09:46 -07:00
Atlante45
12fcb35717 Made RenderArgs a default ctor 2015-05-04 17:22:46 +02:00
Seth Alves
b23427a3c8 hook up menu-items to control debug rendering of collision hulls and owned simulations 2015-04-27 10:32:47 -07:00
Seth Alves
0fb1a83e3b quiet compiler, remove some trailing control-Ms 2015-04-25 09:20:00 -07:00
Brad Davis
e616308911 Adding runtime check to ensure that the correct frustum is fetched during rendering 2015-03-17 16:28:44 -07:00
ZappoMan
d1e648b392 remove unused references to QGLWidget* parent in Overlay and Overlays 2015-02-25 12:34:38 -08:00
Atlante45
647a935eaa Remove app->getAvatar 2015-01-29 15:16:40 -08:00
Atlante45
e1725d1eee Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess 2015-01-20 17:41:08 -08:00
David Rowe
214a18c446 Guard against derefencing NULL 2015-01-19 19:33:12 -08:00
Atlante45
3fbc8c5d44 Moved Menu::shouldRenderMesh() to LODManager 2015-01-17 17:56:33 -08:00
Atlante45
a9047b7b15 LODManager class
Moved most LOD related members in menu to new Dependency
LODManager
	Replaced all Menu::getInstance() call that accessed those
members by DM gets
2015-01-16 17:55:47 -08:00
Ryan Huffman
68a9d80ba3 Update setting drawOnHUD and update to write lock for editOverlay 2015-01-06 18:14:40 -08:00
ZappoMan
9630279459 Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy
Conflicts:
	examples/editVoxels.js
	examples/fallingSand.js
	examples/growTrees.js
	interface/src/Application.cpp
	interface/src/Application.h
	libraries/avatars/CMakeLists.txt
	libraries/entities/src/EntityItem.h
2014-12-31 10:50:53 -08:00
Ryan Huffman
7478b631da Move write lock in Overlays::overlayDrawOnChanged to encompass reads 2014-12-31 10:16:29 -08:00
Ryan Huffman
5caec4dea5 Update overlays to handle updates in drawOnHUD after creation 2014-12-31 10:15:15 -08:00
ZappoMan
141e231958 more work on voxelEctomy 2014-12-30 18:41:56 -08:00
ZappoMan
4ea9bbc309 first major pass at voxelEctomy 2014-12-30 18:08:58 -08:00
Ryan Huffman
3bfc298349 Remove extraneous getDrawonHUD call 2014-12-30 15:31:08 -08:00
Ryan Huffman
929200bc76 Remove qDebug 2014-12-30 15:30:53 -08:00
Ryan Huffman
2b835e621c Rename 2D -> HUD, 3D -> World in Overlays 2014-12-30 14:50:17 -08:00
Ryan Huffman
9bd7912f9f Add support for drawing 3d overlays on the Application Overlay 2014-12-17 16:25:25 -08:00
David Rowe
136c3a2cce Replace 2D and 3D text overlay textWidth() method with textSize() 2014-12-09 18:32:53 -08:00
Atlante45
7322cd3ece Coding Standard 2014-12-04 20:16:50 -08:00
Atlante45
9f444581e9 Fixed JS picking in oculus 2014-12-04 18:53:30 -08:00
Ryan Huffman
f8c8ed868e Update float that should be bool 2014-11-25 12:08:48 -08:00
Ryan Huffman
649ae4a448 Update 3D overlays to only use one list 2014-11-25 09:49:10 -08:00
Ryan Huffman
925c2a8f6c Update array to use pointers 2014-11-25 08:34:44 -08:00
Ryan Huffman
0b46e35f31 Add support for separate list of 3d overlays to be drawn in front 2014-11-24 23:19:17 -08:00
Thijs Wenker
1a9f7c6e21 Merge branch 'master' of https://github.com/worklist/hifi into 20176 2014-11-14 23:01:18 +01:00
Thijs Wenker
fa4555a7a2 Merge branch 'master' of https://github.com/worklist/hifi into 20176
Conflicts:
	interface/src/ui/overlays/Grid3DOverlay.cpp
	interface/src/ui/overlays/ImageOverlay.cpp
	interface/src/ui/overlays/Line3DOverlay.cpp
	interface/src/ui/overlays/LocalVoxelsOverlay.cpp
	interface/src/ui/overlays/LocalVoxelsOverlay.h
	interface/src/ui/overlays/Overlay.h
	interface/src/ui/overlays/Overlay2D.cpp
	interface/src/ui/overlays/Text3DOverlay.cpp
	interface/src/ui/overlays/TextOverlay.cpp
	interface/src/ui/overlays/TextOverlay.h
2014-11-14 20:09:27 +01:00
Sam Gateau
f09b58c255 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-14 10:05:01 -08:00
Sam Gateau
642f436fba first draft of factorizing the rendering traversal for both sides in stereo 2014-11-14 09:56:36 -08:00
David Rowe
8076bfea72 Merge branch 'master' into 20157
Conflicts:
	interface/src/ui/overlays/Text3DOverlay.cpp
2014-11-13 14:53:57 -08:00
Thijs Wenker
cbb3d463b6 Fixed Overlays::isLoaded which did not to find my just created overlay. 2014-11-13 23:29:05 +01:00
AndrewMeadows
b797c7b38c Merge pull request #3782 from ctrlaltdavid/20140
CR for Job #20140 - Add Overlays.getTextWidth
2014-11-13 13:52:53 -08:00
David Rowe
493455fdac Fix const 2014-11-13 11:34:40 -08:00
Thijs Wenker
14655870ec Merge branch 'master' of https://github.com/worklist/hifi into 20176 2014-11-13 20:14:26 +01:00
David Rowe
8d4cecda62 Optimization and coding standard 2014-11-13 11:06:40 -08:00
David Rowe
8c3bedae9d Add position vector and color object script value examples
OverlayPropertyResult type is needed to successfully move QScriptValue
objects from QScriptEngine in Overlays to QScriptEngine in script.
2014-11-12 14:33:52 -08:00
David Rowe
4fa5447c85 Add overlay getProperty() for text overlay "text" property 2014-11-12 12:13:57 -08:00
David Rowe
6cf833cf98 Add text overlay textWidth() method 2014-11-11 17:31:49 -08:00
Ryan Huffman
f577cdd2f4 Add Grid3DOverlay to Overlays 2014-11-11 09:56:47 -08:00
Brad Hefta-Gaub
3a90e869d4 Revert "CR for Job #20140 - Add Overlays.getTextWidth" 2014-11-07 21:50:19 -08:00
David Rowe
7e6d616f20 Add text overlay textWidth() method
Is accessible from JavaScript.
2014-11-07 08:58:31 -08:00
Thijs Wenker
709ad84933 added clone functionality to Overlays:
Overlays.cloneOverlay(OverlayID)
2014-11-05 23:44:59 +01:00
ZappoMan
2570caca40 move 3D overlay rendering into the render portion that supports lighting and shadows 2014-10-29 21:08:37 -07:00
ZappoMan
17a20ceb16 pass the submesh name as extraInfo in the ray pick result 2014-10-29 10:49:24 -07:00
ZappoMan
3e9bc23c2f moving RenderArgs into shared so it can be used by overlays, first cut at ray picking against submeshes 2014-10-29 10:19:04 -07:00
ZappoMan
956d7c73b2 removed debug 2014-10-21 08:21:01 -07:00
ZappoMan
99adb413e3 add 3D text overlay support 2014-10-21 08:20:15 -07:00
David Rowe
fc24d96947 Make overlays accessible from C++ code 2014-10-04 19:31:52 -07:00
ZappoMan
f6b8a51074 CR feedback 2014-10-03 10:03:54 -07:00
ZappoMan
f59185c00b allow 3d overlays to be ignored from ray intersection 2014-10-03 03:02:54 -07:00
ZappoMan
175e5d5f79 add ray picking to 3D overlays 2014-10-02 20:44:49 -07:00
ZappoMan
c3b0700601 introduce Planar3DOverlay for common features of rectangle and circle, introduced rectanglular 3D plane 2014-09-30 14:52:44 -07:00
ZappoMan
16cdc2614f added circle overlays 2014-09-30 10:06:39 -07:00
ZappoMan
3a8c5018ee Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
Conflicts:
	interface/src/Application.h
	libraries/entities/src/EntityTreeElement.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelItem.h
	libraries/models/src/ModelTree.cpp
	libraries/models/src/ModelTree.h
	libraries/models/src/ModelTreeElement.cpp
	libraries/networking/src/PacketHeaders.h
	libraries/octree/src/OctreeEditPacketSender.cpp
	libraries/octree/src/OctreeEditPacketSender.h
2014-08-04 12:01:23 -07:00
Brad Hefta-Gaub
211bed946f Merge pull request #3232 from huffman/19783
Code Review for Job #19783
2014-08-01 16:34:50 -07:00
Ryan Huffman
aa1c9d88dd Cleaup several qDebug calls and commented lines 2014-07-31 10:48:26 -07:00
Ryan Huffman
43f61b4718 Add localmodels overlay type 2014-07-30 18:38:42 -07:00
Atlante45
0bad10b09c Add isLoaded to Overlays 2014-07-29 13:25:42 -07:00
Andrew Meadows
8b3af0b9cb merge upstream/master into andrew/say-no-to-warnings
Conflicts:
	interface/src/ui/ApplicationOverlay.cpp
	libraries/audio/src/AudioRingBuffer.cpp
2014-07-02 10:37:30 -07:00
Atlante45
19be406b1a Added billboards overlays 2014-07-01 15:09:30 -07:00
Atlante45
09cf01e097 ModelOverlay functionnal + bounding box 2014-07-01 12:42:56 -07:00
Andrew Meadows
d78580adc4 remove warning about uninitialized variables 2014-06-25 09:38:12 -07:00
Kai Ludwig
587f60631f missed a tab 2014-05-24 21:28:03 +02:00
Kai Ludwig
c832df0783 added missing locking against crashing in Overlays::~Overlays() 2014-05-24 21:22:34 +02:00
barnold1953
6817c9682e Added a new lock specific to deleting, and improved safety 2014-05-23 11:17:55 -07:00
barnold1953
9553271fa1 Added some missing locks to make Overlays thread safe for reading as well. 2014-05-23 10:44:40 -07:00
barnold1953
3a45104793 Made overlays thread safe for write operations, which solved a script
crash.
2014-05-22 17:55:25 -07:00
Atlante45
7d40790260 Don't compute avatar anchor specs if uneeded 2014-05-17 22:08:28 -07:00
Atlante45
0edcd732fe Added rotation and scale to overlay anchers 2014-05-16 17:36:27 -07:00
Atlante45
61fd09e0bd Add ability to anchor an overlay 2014-05-15 16:24:31 -07:00
Stephen Birarda
684c6b5372 run regex header replacement on all cpp files 2014-04-09 09:35:42 -07:00
ZappoMan
a56b7e341d reorganize files in interface directory 2014-03-22 20:22:05 -07:00
Renamed from interface/src/ui/Overlays.cpp (Browse further)