Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 19:42:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
26777 commits 24 branches 28 tags 1.2 GiB
Commit graph

38 commits

Author SHA1 Message Date
Sam Gateau
5c547037f2 Migrating the overaly 3d rendering in their own job and their own shader 2015-06-17 15:54:20 +02:00
Ryan Huffman
d47f5a2abb Update Rectangle, Grid, and Billboard overlays to use batches 2015-06-16 16:45:53 -07:00
Ryan Huffman
36c14de250 Add rotation to facingAvatar billboard overlays 2015-03-10 13:11:39 -07:00
Ryan Huffman
c499352ad8 Update billboard and planar overlays to use new findRayRectangleIntersection signature 2015-02-25 10:27:11 -08:00
Ryan Huffman
be7959bbcd Fix BillboardOverlay findRayIntersection implementation 2015-02-24 17:00:55 -08:00
Ryan Huffman
89c10ca2ec Fix BillboardOverlay::findRayIntersection 2015-02-24 14:36:24 -08:00
Ryan Huffman
13ea8ddb9e Add missing _texture to BillboardOverlay copy ctor 2015-02-03 08:52:58 -08:00
Ryan Huffman
1f24658f67 Remove BillboardOverlay::replyFinished() 2015-01-30 14:45:45 -08:00
Ryan Huffman
efd383d269 Update BillboardOverlay to use NetworkTexture 2015-01-30 14:42:41 -08:00
ZappoMan
e6388a65b9 rough pass at adding color to geometry cache 2015-01-13 20:53:05 -08:00
Atlante45
be050b0469 Added missing deletes 2015-01-05 15:13:07 -08:00
ZappoMan
3d42d532e4 more work on removing immediate mode GL_QUADS 2014-12-22 17:43:02 -08:00
ZappoMan
a6b86da47a basics of triangle picking working for models 2014-12-05 11:31:27 -08:00
ZappoMan
42e8d4d377 fix warnings in overlays 2014-11-15 20:38:21 -08:00
Thijs Wenker
38ed104397 added const to copy constructors 2014-11-15 00:21:50 +01:00
Thijs Wenker
ba5491bc8b moved writeToClone to copy constructor 2014-11-14 22:55:25 +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
Thijs Wenker
fa03a7eb0c fix ubuntu build 2014-11-14 19:53:56 +01:00
David Rowe
fac6b6b426 Refactor QRect conversion to QScriptValue 2014-11-12 21:32:55 -08:00
David Rowe
9e19641a1d Add property getting for all 3D overlays 2014-11-12 21:05:44 -08:00
Thijs Wenker
709ad84933 added clone functionality to Overlays: 
Overlays.cloneOverlay(OverlayID)
 2014-11-05 23:44:59 +01: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
Stephen Birarda
df6f4d4c95 remove cara face tracking, cleanup warnings 2014-10-10 14:17:52 -07:00
David Rowe
b718d27ac6 Merge branch 'master' into 20073 2014-10-10 12:04:36 -07:00
ZappoMan
8105ded4eb handle reloading a new url in billboard overlays 2014-10-09 21:12:05 -07:00
David Rowe
614f5314f2 Add some property setters to the billboard overlay 2014-10-04 19:32:20 -07:00
ZappoMan
515789927b fix float defines from CR feedback 2014-10-03 09:43:46 -07:00
ZappoMan
175e5d5f79 add ray picking to 3D overlays 2014-10-02 20:44:49 -07:00
ZappoMan
5bcbfe96b8 add alpha color support to billboard overlay 2014-10-02 10:19:08 -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
Stephen Birarda
7964180905 handle place creation at new API endpoint 2014-09-11 17:33:01 -07:00
Atlante45
28d4efbad6 Don't display anything if overlays not loaded 2014-07-29 13:15:09 -07:00
Atlante45
7ad90ac7bb When visible is false, don't render billboards/models overlays 2014-07-11 11:29:58 -07:00
Atlante45
22bcb7d7e7 Billboard overlays disply grey square while image is loading 2014-07-11 11:22:06 -07:00
Atlante45
bd7b17a787 Added subimage to Billboards overlays 2014-07-11 10:50:11 -07:00
Atlante45
ab15a1487e Switched BillboardOverlay to NetworkAccessManaqer 2014-07-01 17:44:38 -07:00
Atlante45
d63ad86db0 Removed unnecessary function 2014-07-01 15:37:52 -07:00
Atlante45
19be406b1a Added billboards overlays 2014-07-01 15:09:30 -07:00