Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 18:04:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
65784 commits 75 branches 59 tags 1.2 GiB
Commit graph

61 commits

Author SHA1 Message Date
David Rowe
a7cd5a240a Fix "text" overlay not clipping to right and bottom margins 2018-03-15 17:31:02 +13:00
David Rowe
0146eca315 JSDoc review 2017-12-07 10:09:05 +13:00
David Rowe
4b5aa9bdec Add Overlays API functionality JSDoc 2017-11-25 16:18:14 +13:00
Brad Davis
06071c6493 Fixing build errors 2016-01-28 16:03:26 -08:00
Brad Davis
5b817ccc21 Make all 2D overlays QML 2016-01-28 16:03:26 -08:00
Atlante45
3dc8bd47ae Fix warning and remove unused headers 2015-08-05 16:46:44 -07:00
Zander Otavka
da2afca391 Expose overlay type checking to JavaScript. 2015-07-31 11:26:04 -07:00
Bradley Austin Davis
ae539afafb Fix deadlock when using textoverlay from main thread 2015-07-22 07:23:12 -04:00
Brad Davis
5b494c23fd More header cleanup 2015-07-18 22:38:26 -07:00
Bradley Austin Davis
3bfa8aae0b Removing debug output 2015-07-17 14:34:24 -07:00
Brad Davis
914b47069b Working on line height 2015-07-17 14:33:32 -07:00
Bradley Austin Davis
24643ca282 Working on line spacing 2015-07-17 14:19:39 -07:00
Brad Davis
6f998e5d28 Working on line spacing on mac 2015-07-17 13:32:31 -07:00
Bradley Austin Davis
c5e0298f8d Working on mac sizing 2015-07-17 12:22:38 -07:00
Brad Davis
7e32bfb85e Fixing mac/linux build 2015-07-16 17:35:05 -07:00
Brad Davis
89faf85ad9 Working on text rendering overlays 2015-07-16 15:56:01 -07:00
David Rowe
e85eb246d2 Delete old TextRenderer after new one is in place 2015-07-01 13:19:46 -07:00
David Rowe
215c260c9e Fix TextOverlay font size setting 2015-06-30 17:08:43 -07:00
Atlante45
e3d22ef94b Fix overlays getBounds + code cleanup 2015-06-24 16:13:42 -07:00
Bradley Austin Davis
ce3d1bd9a4 Fix the 2D text overlay backgrounds to stop using a previously bound texture 2015-06-22 16:19:31 -07:00
Atlante45
10c2f3f561 More TextRenderer work 2015-05-28 14:51:57 +02:00
Atlante45
9b49936d29 TextRenderer memory leak 2015-05-20 16:41:47 +02:00
ZappoMan
912b851eb7 remove crufty references to QGLWidget 2015-02-25 12:54:34 -08:00
Ryan Huffman
d7e18d6f6d Update TextOverlay::textSize to use new TextRenderer::getExtents 2015-02-11 11:04:04 -08:00
Brad Davis
6cfb51283e Working on the text renderer 2015-02-03 01:49:06 -08:00
ZappoMan
2f4e98082b remove glColor calls related to text rendering 2015-01-28 13:54:48 -08:00
ZappoMan
7d9de6d0eb added some TODO comments and some cleanup 2015-01-28 11:03:05 -08:00
ZappoMan
e6388a65b9 rough pass at adding color to geometry cache 2015-01-13 20:53:05 -08:00
ZappoMan
14458ac8fd first pass at removing immediate mode GL_QUADS 2014-12-22 13:47:18 -08:00
Ryan Huffman
25a78534aa Fix quad vertices for ImageOverlay and TextOverlay 2014-12-19 15:52:31 -08:00
ZappoMan
2be3b73e8c move TextRender to libraries/render-utils 2014-12-17 12:32:52 -08:00
David Rowe
8cf50b71ea Update some comments to reflect changes 2014-12-09 19:18:37 -08:00
David Rowe
136c3a2cce Replace 2D and 3D text overlay textWidth() method with textSize() 2014-12-09 18:32:53 -08:00
David Rowe
bd6ea9b4e7 Render with backgroundAlpha property 2014-12-05 11:18:03 -08:00
David Rowe
f5a1c26492 Add backgroundAlpha property to 2D and 3D text overlays 2014-12-05 11:08:00 -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
76ae60c5ca fix Ubuntu build 2014-11-14 19:27:27 +01:00
David Rowe
8076bfea72 Merge branch 'master' into 20157 
Conflicts:
	interface/src/ui/overlays/Text3DOverlay.cpp
 2014-11-13 14:53:57 -08: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
6f4952c7d5 More consts 2014-11-13 12:25:15 -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
725d56d41f Add property getting for all 2D overlays 2014-11-12 16:50:13 -08:00
David Rowe
4fa5447c85 Add overlay getProperty() for text overlay "text" property 2014-11-12 12:13:57 -08:00
David Rowe
8ac3aba2bd Make text overlays apply alpha to text as well as background 2014-11-11 17:54:02 -08:00
David Rowe
6cf833cf98 Add text overlay textWidth() method 2014-11-11 17:31:49 -08:00
Brad Hefta-Gaub
3a90e869d4 Revert "CR for Job #20140 - Add Overlays.getTextWidth" 2014-11-07 21:50:19 -08:00
David Rowe
a904b128b3 Fix boolean literal value 2014-11-07 15:28:39 -08:00
David Rowe
7e6d616f20 Add text overlay textWidth() method 
Is accessible from JavaScript.
 2014-11-07 08:58:31 -08:00