Sam Gateau
dc10f30d3d
Merged
2015-07-23 15:10:42 -07:00
Sam Gateau
a561874ce3
Render the rear view mirror in a separate target and then display it during overlay pass
2015-07-23 14:56:14 -07:00
ZappoMan
c2113ea96b
remove non-batch versions of GeometryCache renderXYZ() methods
2015-07-23 07:42:58 -07:00
Brad Davis
9016f437a8
Merge pull request #5371 from Atlante45/smart_pointers
...
Smart pointers fixes
2015-07-21 08:52:29 -07:00
ZappoMan
d41d86c33c
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-07-20 14:31:58 -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
d68618e206
Removing GL headers from most files, and some naked GL from application.cpp
2015-07-18 00:46:09 -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
816fd41624
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-07-17 17:10:52 -07:00
Brad Hefta-Gaub
2423d25839
Merge pull request #5355 from ctrlaltdavid/20620
...
QA for #20620 - Make renderGrid handle changing position and dimensions
2015-07-17 17:10:43 -07:00
David Rowe
c46533d9a6
Make renderGrid handle changing position and dimensions
...
So that audio scope grid moves when Interface window is resized.
2015-07-16 21:05:14 -07:00
ZappoMan
398075e45a
hacking on more naked GL
2015-07-16 16:26:28 -07:00
ZappoMan
2ad2c4d554
remove some dead code
2015-07-15 15:33:28 -07:00
ZappoMan
293ccc1713
remove some dead code
2015-07-15 15:32:02 -07:00
ZappoMan
d19c7125da
remove naked gl calls
2015-07-14 16:49:43 -07:00
Atlante45
80fe090a94
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-10 20:20:03 -07:00
Atlante45
a3848f08d2
Conditionnal fixes.
2015-07-10 15:36:17 -07:00
Atlante45
5cfa1605df
Made Texture safe with resource refresh
2015-07-10 12:28:06 -07:00
Brad Davis
6c5d7b8789
Performance optimizations in transform buffers and geometry cache
2015-07-09 17:53:26 -07:00
samcake
84b70fbaca
Mergin yellow with the Status bar rendering into Daft cwith the switch to batch for deferred pass
2015-07-03 11:36:19 -07:00
Atlante45
7b5a5a339a
Use make_shared/create to make shared pointers
2015-07-01 19:46:06 -07:00
Sam Gateau
c41ebcae78
Covering all the case for rendering the light passes
2015-06-26 15:40:08 -07:00
Seth Alves
f75506bf1b
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-22 15:37:10 -07:00
Brad Davis
1b44c220a7
Prep work for procedural stars & stuff
2015-06-22 09:43:12 -07:00
Seth Alves
f284e9d070
quiet compiler
2015-06-22 07:18:30 -07:00
Seth Alves
5381e6e9bb
entity server has its own version of actions which simply remember the encoded arguments. Entities with actions don't experience simulateKinematicMotion
2015-06-19 16:20:07 -07:00
Brad Davis
48b27acc79
Merge remote-tracking branch 'upstream/master' into overlay
...
Conflicts:
interface/src/Application.cpp
interface/src/ui/ApplicationOverlay.cpp
2015-06-18 18:17:59 -07:00
Atlante45
26e8c490c3
constexpr not handled on windows
2015-06-18 15:23:54 +02:00
Atlante45
5166d833a7
Make array size a constexpr
2015-06-18 15:23:53 +02:00
Atlante45
8a3a7e5b7f
Reorder triangle strip
2015-06-18 15:23:50 +02:00
Atlante45
70a020c7e3
BevelRect use triangle strips
2015-06-18 15:23:49 +02:00
Atlante45
bdaf8a8a32
Fix bevel quads
2015-06-18 15:22:48 +02:00
Bradley Austin Davis
1705eb8f80
Reverting some changes, putting overlay rendering in its own state manager
2015-06-17 16:08:19 -07:00
Brad Davis
00d8fe75ab
Breaking up overlay into rendering and compositing classes
2015-06-13 17:36:08 -07:00
Brad Davis
737e418878
Revert "Revert "Merge pull request #5106 from jherico/render_cursor""
...
This reverts commit 0cdc2b53fe
2015-06-13 10:02:54 -07:00
ZappoMan
0cdc2b53fe
Revert "Merge pull request #5106 from jherico/render_cursor"
...
This reverts commit 4d18bd7cec24fda9a733
2015-06-12 12:57:24 -07:00
Brad Davis
94c414e4e8
Add unit quad, commonly used in compositing the overlays
2015-06-10 08:12:58 -07:00
ZappoMan
7c40b666e8
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching-scene-api
2015-06-03 09:52:40 -07:00
Eric Levin
533148f26d
line being sent as array
2015-05-28 15:48:31 -07:00
Atlante45
c0725813b6
typo
2015-05-25 12:11:24 +02:00
Atlante45
4bbc5de39d
Remove "raw" gl calls
...
Removed calls to batch._gl*
Added init/killInput in glBackend ctor/dtor
This will disable client states and set buffers to 0
2015-05-17 11:58:39 +02:00
Atlante45
b11525debf
Add missing batch args
2015-05-16 04:03:46 +02:00
Atlante45
c220435364
Restore gl* calls but record them with batch
2015-05-16 04:01:08 +02:00
Ryan Huffman
776955b040
Move GeometryCache gl* calls to non-batch methods
2015-05-15 15:21:02 -07:00
Ryan Huffman
5abd4bb08e
Update GeometryCache to accept gpu::Batch
2015-05-15 15:20:50 -07:00
Anthony J. Thibault
ede42285b1
Improvements to particle entity.
...
* Changed particle geometry to billboarded quads
* Added texture support
* Added ajt-test.js particle test script.
* GeometryCache support for batched quads with texCoords.
* Bug fix for infinite loop if _lifetime was very large.
* Don't reset the simulation on animation loop.
* stop emitting particles on animation stop, but keep simulating until there are no more living particles.
* Removed some trailing whitespace
2015-05-10 17:13:46 -07:00
Brad Hefta-Gaub
5551997cdc
Merge pull request #4780 from samcake/blue
...
Add support for Skybox and rendering path of background according to Zones
2015-05-06 14:41:06 -07:00
samcake
06e1330e42
Clean up the includes in gpu, make the skybox shader works
2015-05-06 12:12:54 -07:00
Howard Stearns
4090f892b2
Merge remote-tracking branch 'upstream/master' into objReader
2015-05-05 14:58:18 -07:00
Sam Gateau
73177cd81d
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2015-05-04 14:07:59 -07:00
