Bradley Austin Davis
f19653f3e2
Integrate glew
2015-08-01 20:08:19 -07:00
Brad Davis
b84eef93c9
Core profile shader work and test code
2015-08-01 14:43:52 -07:00
Sam Gateau
d84e2d31ea
Merge with master
2015-07-30 11:20:00 -07:00
Andrew Meadows
77a12eb50e
compile on linux with GLEW
2015-07-28 17:53:01 -07:00
Sam Gateau
baf7873ce1
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2015-07-27 17:40:19 -07:00
Sam Gateau
f525a8a245
Removing all the unecessary calls of Batch from the gl legacy time
2015-07-27 17:17:56 -07:00
Anthony J. Thibault
5844b594dc
Converted magic numbers to constants.
2015-07-27 09:27:16 -07:00
Anthony J. Thibault
5cc0b45850
Improved ParticleEffectEntityItem rendering and updates
...
* Created custom pipelines and shaders for untextured and textured
particle rendering.
* Created custom render payload for particles
* Moved all particle updates into simulation rather then render.
* Uses pendingChanges.updateItem lambda to update the playload with
new data for rendering.
* ParticleEffectEntityItem now updates its dimensions properly,
based on emitter properties.
* Bug fix for dt not accumulating properly, during gaps between updates.
now we just update all the time. (super cheap tho, if there are no particles
animating)
2015-07-26 17:21:17 -07:00
Atlante45
8d6ff2d9f9
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-20 14:50:44 -07:00
Atlante45
59acfc9f47
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-20 13:51:51 -07:00
Stephen Birarda
0177513285
resolve conflicts on merge with upstream/master
2015-07-20 12:29:38 -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
Stephen Birarda
f8c832e50b
resolve conflicts on merge with upstream master
2015-07-17 16:48:46 -07:00
Brad Davis
89faf85ad9
Working on text rendering overlays
2015-07-16 15:56:01 -07:00
Stephen Birarda
05dde9d8f5
resolve conflicts on merge with upstream/master
2015-07-15 16:18:47 -07:00
ZappoMan
819fa852b8
first pass at GlowEctomy
2015-07-15 12:47:59 -07:00
Stephen Birarda
8b5026a817
cleanup some warnings
2015-07-15 11:20:55 -07:00
Atlante45
8fb69ecc96
Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart
2015-07-14 13:50:58 -07:00
Clément Brisset
17c6f41db6
Merge pull request #5306 from ctrlaltdavid/20606
...
CR for 20606 - If an external texture isn't found, still display the model
2015-07-14 13:49:00 -07:00
Atlante45
7bf45308b6
Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart
2015-07-14 12:31:37 -07:00
Ryan Huffman
0edc909818
Merge branch 'protocol' of github.com:birarda/hifi into receive_packets
...
Conflicts:
assignment-client/src/audio/AudioMixer.cpp
interface/src/Application.cpp
libraries/networking/src/Packet.cpp
2015-07-14 10:21:31 -07:00
Stephen Birarda
821c16cbc4
resolve conflicts on merge with uptream/master
2015-07-14 09:52:20 -07:00
Brad Davis
684d466b44
Merge pull request #5308 from venkatn93/avatar
...
Avatars rendered correctly based on Scene.shouldRenderAvatars
2015-07-14 09:06:49 -07:00
Niraj Venkat
ef3c6b25e0
More coding standard changes
2015-07-14 00:45:38 -07:00
ZappoMan
5676246d75
fix the lingering model parts sometimes left behind when switching domains
2015-07-13 15:26:52 -07:00
Stephen Birarda
d990420565
repairs to octree packet receiving in interface
2015-07-13 13:10:57 -07:00
Stephen Birarda
264f39fa59
resolve conflicts on merge with upstream/master
2015-07-13 11:25:24 -07:00
David Rowe
d44743563b
Merge branch 'master' into 20606
...
Conflicts:
libraries/render-utils/src/Model.cpp
2015-07-13 07:53:04 -07:00
Atlante45
80fe090a94
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-10 20:20:03 -07:00
David Rowe
8ecefdfe39
If an external texture isn't found, still display the model
...
If the texture is present the next Interface is run then it will be used.
2015-07-10 16:03:27 -07:00
Atlante45
a3848f08d2
Conditionnal fixes.
2015-07-10 15:36:17 -07:00
Atlante45
49993695a5
Made geometry refresh safe
2015-07-10 15:20:19 -07:00
Sam Gateau
2c05349b06
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-10 11:10:07 -07:00
Sam Gateau
7fc9fd97ff
Replacing setUniformTexture by setResourceTexture in order to differenciate the 2 types of binding points for the BUffers.
2015-07-10 11:03:12 -07:00
Niraj Venkat
706f85e4ce
Fixes to comply with coding standard
2015-07-09 17:31:38 -07:00
Niraj Venkat
bd91daf712
Removing debug code
2015-07-09 16:27:23 -07:00
Niraj Venkat
1dce5f80cc
Entities are now added/removed from rendering based on Scene.shouldRenderEntities
2015-07-09 16:17:58 -07:00
Stephen Birarda
19c5f0b67c
resolve conflicts on merge with upstream/master
2015-07-08 22:54:36 -07:00
Atlante45
e2718d5c94
Merge branch 'protocol' of https://github.com/birarda/hifi into protocol
2015-07-08 18:26:36 -07:00
Sam Gateau
4c44eb63da
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-08 14:25:41 -07:00
Sam Gateau
f992e875b4
Adding intrsumentation for nsight and hiding the nsight specific code in cpp
2015-07-08 14:25:13 -07:00
Stephen Birarda
74940a2132
replace lingering PacketTypes in old format
2015-07-08 10:18:13 -07:00
Atlante45
687f9dda4a
Restore old offset behaviors
2015-07-06 18:21:17 -07:00
Atlante45
541d9ae431
Merge branch 'master' of https://github.com/highfidelity/hifi into fix_billboard
2015-07-06 18:05:43 -07:00
Sam Gateau
4d48b98364
For a fistfull of magic numbers
2015-07-06 14:22:09 -07:00
Sam Gateau
95f5b14d45
CLenaing the interface of Item::Status to be more explicit and removing magic numbers
2015-07-06 12:47:35 -07:00
Atlante45
c61bf34200
Use depth bias to avoid z-fighting on text entities
2015-07-04 18:35:00 -07:00
Atlante45
0eb89efb34
Fix text entity billboarding
2015-07-04 16:06:38 -07:00
Sam Gateau
76ca093e05
something working ?
2015-07-02 18:12:03 -07:00
