Commit graph

30 commits

Author SHA1 Message Date
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
ZappoMan
41c135c4e5 move GlowEffect to libraries 2014-12-15 19:19:21 -08:00
Ryan Huffman
0b23b57e1e Update border comment in Cube3DOverlay 2014-11-25 12:43:01 -08:00
Ryan Huffman
2cb30c2157 Update color used for Cube3DOverlay border 2014-11-25 12:17:46 -08:00
Ryan Huffman
c5f2b3b588 Add borderSize to Cube3DOverlay 2014-11-25 12:05:13 -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
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
ZappoMan
515789927b fix float defines from CR feedback 2014-10-03 09:43:46 -07:00
ZappoMan
b2e725c964 add dashed line support to cube overlay 2014-10-02 10:18:42 -07:00
ZappoMan
bffd236640 add glowLevel, and pulse to all overlays 2014-09-29 16:44:40 -07:00
Atlante45
b098a7a294 Fixed wire cube overlay not drawn with right line width 2014-04-18 15:59:37 -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/Cube3DOverlay.cpp (Browse further)