David Rowe
0146eca315
JSDoc review
2017-12-07 10:09:05 +13:00
David Rowe
cd2922a560
Merge branch '21602' into 21624
...
# Conflicts:
# tools/jsdoc/plugins/hifi.js
2017-11-28 17:04:59 +13:00
David Rowe
4b5aa9bdec
Add Overlays API functionality JSDoc
2017-11-25 16:18:14 +13:00
ZappoMan
04ee1adabd
Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup
2017-11-19 14:40:31 -08:00
David Rowe
12e005f215
Initial update of Overlays JSDoc
2017-11-17 17:59:11 +13:00
SamGondelman
224386317d
send overlay visibility through transaction
2017-11-09 12:14:40 -08:00
ZappoMan
f63db42c0e
migrate SpatiallyNestable::getOrientation to getWorldOrientation, remove redundant getRotation
2017-10-28 10:14:25 -07:00
ZappoMan
a7a0f03ede
rename SpatiallyNestable::getPosition() to SpatiallyNestable::getWorldPosition()
2017-10-27 18:39:17 -07:00
SamGondelman
b59ec07171
move hud rendering to render thread, still need to separate out hud overlays
2017-09-29 09:49:08 -07:00
samcake
d112ffd8d6
Moving all the 3D overlay transform evaluation out of the render thread to the game loop, need to do something for the line3d
2017-09-20 18:06:49 -07:00
samcake
524c94cdd4
Adding more comments for future fixmes
2017-09-15 14:35:45 -07:00
SamGondelman
3a80c6cbe2
fix alpha issues, pipeline issue, clamping issue
2017-08-21 18:09:25 -07:00
SamGondelman
3c8b964cc9
replace setHandLasers with drawHUDLayer overlay property
2017-07-24 18:16:40 -07:00
Sam Gateau
4edea433ce
Rename the _pipeline into _shapePipeline in the render::Args
2017-07-10 12:16:53 +02:00
samcake
20d8c11e28
ALmost there, getting eback everything to work with the light and background stages in the scene, not in deferredLighting Effect anymore
2017-06-22 17:54:16 -07:00
Brad Davis
2705ee7030
Remove the use of implicit ids in geometry cache
2016-10-19 11:18:25 -07:00
SamGondelman
2eb0c7735f
working on fading shape entities
2016-08-03 13:30:05 -07:00
Brad Davis
5288d98376
Using pipelines properly where appropriate
2016-06-30 20:52:41 -07:00
Brad Davis
b7926b8582
Don't render wire geometry with lighting effects
2016-06-30 16:11:05 -07:00
Brad Davis
2f89253dc1
Make Overlays usable from QML
2016-03-04 11:35:54 -08:00
Zach Pomerantz
53bd595b77
Update all appropriate overlays to use plumber
2016-02-03 19:18:56 -08:00
Atlante45
7e8ea4dc77
Update primitive instance rendering calls
2016-02-01 18:50:01 +01:00
Atlante45
11dc3cd261
Move primitive rendering out of DeferredLightingEffect
2016-01-13 11:47:43 -08:00
Bradley Austin Davis
e024d23366
Instancing work, second pass
2015-09-21 13:27:02 -07:00
Zander Otavka
da2afca391
Expose overlay type checking to JavaScript.
2015-07-31 11:26:04 -07:00
Seth Alves
24fff719c5
quiet compiler
2015-07-25 21:11:23 -07:00
Brad Davis
5b494c23fd
More header cleanup
2015-07-18 22:38:26 -07:00
ZappoMan
d1e511efcb
more naked gl cleanup, deleting dead code, tweaking comments so they don't give false positives in searching for more naked gl
2015-07-15 15:52:12 -07:00
ZappoMan
819fa852b8
first pass at GlowEctomy
2015-07-15 12:47:59 -07:00
ZappoMan
23b89a6f7d
remove naked gl/dead code from line and cube overlays
2015-07-14 17:04:07 -07:00
Atlante45
e3d22ef94b
Fix overlays getBounds + code cleanup
2015-06-24 16:13:42 -07:00
Sam Gateau
3176c8e93c
polish before PR
2015-06-17 17:09:33 +02:00
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
8241a2170b
Update cube, line, and sphere overlays to use batches
2015-06-16 09:50:42 -07:00
Atlante45
5d2187cedf
Remove non batch call to bind/releaseSimpleProgram
2015-05-22 16:37:02 +02:00
Atlante45
a7ee10001a
Remove used deprecated methods
...
Also added a warning on the single one in use right now,
so that it gets deleted once it is moved to the rendering pipeline
2015-05-18 16:37:28 +02:00
Ryan Huffman
b31f95a002
Fix cube rendering not working with transparency
2015-04-23 09:34:23 -07:00
ZappoMan
912b851eb7
remove crufty references to QGLWidget
2015-02-25 12:54:34 -08:00
ZappoMan
efb044ea5e
change renderDashedLine() to take a color paramter
2015-01-28 15:08:59 -08:00
ZappoMan
db94949649
Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing
...
Conflicts:
interface/src/avatar/SkeletonModel.cpp
2015-01-14 17:55:03 -08:00
ZappoMan
e6388a65b9
rough pass at adding color to geometry cache
2015-01-13 20:53:05 -08:00
Atlante45
2a82ff9768
Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11
...
Conflicts:
assignment-client/src/voxels/VoxelServer.cpp
interface/src/Application.cpp
interface/src/Audio.cpp
interface/src/DatagramProcessor.cpp
interface/src/Menu.cpp
interface/src/Util.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/ui/ApplicationOverlay.cpp
interface/src/ui/PreferencesDialog.cpp
libraries/networking/src/NodeList.cpp
libraries/shared/src/DependencyManager.h
2015-01-13 11:03:14 -08:00
ZappoMan
0606861b66
dashed lines in GeometryCache
2015-01-05 21:45:17 -08:00
Ryan Huffman
2b835e621c
Rename 2D -> HUD, 3D -> World in Overlays
2014-12-30 14:50:17 -08:00
Ryan Huffman
468c564566
Replace glutSolidCube with GeometryCache::renderSolidCube
2014-12-19 15:29:00 -08:00
Ryan Huffman
f3a600da7e
Remove glut call
2014-12-19 12:01:18 -08:00
Ryan Huffman
51a64650e4
Fix use of glOrtho and replace getDeferredLightingEffect w/ DependencyManager
2014-12-19 09:04:54 -08:00
Ryan Huffman
5b89208068
Merge branch 'master' of git://github.com/highfidelity/hifi into orientation-display
...
Conflicts:
interface/src/ui/ApplicationOverlay.cpp
interface/src/ui/overlays/Cube3DOverlay.cpp
2014-12-18 16:46:17 -08:00
Ryan Huffman
27e13385ed
Fix drawing of Cube3D on the ApplicationOverlay
...
This seems to break because the ApplicationOverlay is drawn to a texture
buffer first, which is incompatible with the DeferredLightingEffect
implementation.
2014-12-17 16:40:04 -08:00
ZappoMan
fc1e1ecfc0
move DeferredLightingEffect and AmbientOcclusionEffect to libraries, make them DependencyManager enabled
2014-12-16 11:27:44 -08:00
