Sam Gateau
83c4a52454
Cleaning for PR
2015-05-31 19:34:03 -07:00
Sam Gateau
33d397a440
A fist update solution for the item
2015-05-31 19:10:37 -07:00
Sam Gateau
ddec8fd26f
Trying to find a good solution for update message & data
2015-05-30 13:57:05 -07:00
Sam Gateau
7bde81e95f
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into daft
2015-05-29 15:50:31 -07:00
Sam Gateau
f04f3bda72
Introducing the RenderDeferredTask class which moves the current rendering pipeline into the render::ENgine scheme
2015-05-29 15:44:14 -07:00
samcake
f8a90684ce
Merge pull request #5000 from huffman/scene-overlay
...
Team Teaching - Move overlay rendering to Scene pipeline
2015-05-29 15:31:46 -07:00
Brad Hefta-Gaub
c71519bfb1
Merge pull request #4996 from samcake/punk
...
TEAM TEACHING: Culling, LOD and Depth sort added to DrawSceneTask
2015-05-29 15:06:17 -07:00
Ryan Huffman
b37a023041
Remove all overlays from Scene on desctruction
2015-05-29 14:55:53 -07:00
Ryan Huffman
3f5b115c67
Move _overlays after scene in Application so it destructs first
2015-05-29 14:55:32 -07:00
Sam Gateau
1bdd6139bd
Merge branch 'punk' of https://github.com/samcake/hifi into daft
2015-05-29 14:03:04 -07:00
Sam Gateau
81396ae5aa
TRying again a better compare function signature for ubunutu
2015-05-29 13:48:19 -07:00
Ryan Huffman
667dccbb87
Add Item::INVALID_ITEM_ID and use in overlays
2015-05-29 13:43:49 -07:00
Sam Gateau
98160c8d60
Reorganize the sorting classes for maybe compiling on linux gcc 4.8 ?
2015-05-29 13:31:17 -07:00
Sam Gateau
eef8077417
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk
2015-05-29 13:20:43 -07:00
Brad Hefta-Gaub
fe9c2858e0
Merge pull request #5002 from Atlante45/entities
...
TEAM TEACHING - PolyVox entities render in entities Batch
2015-05-29 12:29:01 -07:00
Brad Hefta-Gaub
b2b5d0eaf7
Merge pull request #5003 from Atlante45/team-teaching
...
Update team teaching
2015-05-29 12:28:09 -07:00
Atlante45
e9edc3e789
PolyVox entities use simple program
2015-05-29 20:05:38 +02:00
Atlante45
f70fb0801b
Merge branch 'team-teaching' into entities
2015-05-29 19:58:59 +02:00
Atlante45
abc261f289
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching
2015-05-29 19:58:35 +02:00
Atlante45
d8168811b3
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-05-29 19:58:22 +02:00
Seth Alves
b0f6826d17
Merge pull request #4995 from birarda/domain-dtls
...
speed up initial connection to domains
2015-05-29 10:50:01 -07:00
Andrew Meadows
64eba660ad
Merge pull request #5001 from howard-stearns/entity-collision-end
...
get end collision events in entity collision handler
2015-05-29 10:40:50 -07:00
Sam Gateau
0a0c0482ae
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into daft
2015-05-29 10:09:20 -07:00
Howard Stearns
8e245ec4c2
getCollisionEvents has a side-effect on state (removing END events from further consideration), so it must be called once per step.
...
Otherwise entities never get to see end events.
Also, entity collision processing should only be done when there are outgoing changes (just like for avatar).
2015-05-29 09:59:21 -07:00
Andrew Meadows
f049dc37fc
Merge pull request #4992 from howard-stearns/preload-collision-sounds
...
Preload collision sounds
2015-05-29 09:51:41 -07:00
Stephen Birarda
e91ee7e7e3
only send add packet for nodes in interest set
2015-05-29 09:49:54 -07:00
Ryan Huffman
b4db787837
Merge branch 'team-teaching' of github.com:highfidelity/hifi into scene-overlay
2015-05-29 09:42:46 -07:00
Ryan Huffman
b4806f5aac
Fix render::PendingChanges using render::Scene::PendingChanges
2015-05-29 09:40:52 -07:00
Ryan Huffman
0e5cf273ab
Fix AABox bounds handling in Overlays
2015-05-29 09:40:23 -07:00
Ryan Huffman
b21d0a3a53
Remove Overlays::renderWorld from Application
2015-05-29 09:40:03 -07:00
Brad Hefta-Gaub
ae6b13b77c
Merge pull request #4999 from Atlante45/team-teaching
...
Update team-teaching
2015-05-29 09:21:25 -07:00
Atlante45
27d932bed4
Merge branch 'team-teaching' into entities
2015-05-29 18:07:43 +02:00
Ryan Huffman
2222468e89
Remove Overlays::renderWorld
2015-05-29 08:53:40 -07:00
Atlante45
ab13bc41a4
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching
2015-05-29 17:53:17 +02:00
Ryan Huffman
b2c503af0e
Add NO_DEPTH_SORT ItemKey flag
2015-05-29 08:52:37 -07:00
Ryan Huffman
874f722504
Remove unused Avatar::Pointer typedef
2015-05-29 08:51:37 -07:00
Ryan Huffman
1089490658
Move overlay rendering to Scene
2015-05-29 08:51:25 -07:00
Atlante45
ad2d4d5e85
PolyVox entities render in Batch
2015-05-29 17:44:41 +02:00
Brad Hefta-Gaub
0380be7550
Merge pull request #4997 from Atlante45/text-renderer
...
TEAM TEACHING - Web entities render in batch
2015-05-29 08:38:02 -07:00
Atlante45
0384b74479
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-05-29 17:37:53 +02:00
Brad Hefta-Gaub
fdded9e0bd
Merge pull request #4998 from Atlante45/entities
...
TEAM TEACHING - Update setDimension/Reactivate isValidScale asserts
2015-05-29 08:35:10 -07:00
Atlante45
75788a3c51
Reactivate Transform asserts
2015-05-29 17:05:56 +02:00
Atlante45
f07f9ac0c5
Expand setDimensions check to negative values
2015-05-29 17:04:39 +02:00
Atlante45
212007aa6f
Cleanup simple fragmen shaders
2015-05-29 16:53:53 +02:00
Atlante45
1d336b76de
Web entities render in Batch
2015-05-29 16:51:48 +02:00
Atlante45
0770f88606
Add glTexParamteri to GLBackend/Batch
2015-05-29 16:50:11 +02:00
Atlante45
51570aac68
Add simple textured pipeline
2015-05-29 16:49:31 +02:00
Atlante45
34072c55e3
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into text-renderer
2015-05-29 16:16:06 +02:00
Sam Gateau
dd9cafcd09
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk
2015-05-28 18:14:41 -07:00
Sam Gateau
3f8bdc14c4
reinserting culling, lod and depth sort to the rendering
2015-05-28 18:01:31 -07:00
