Sam Gateau
bd7c22e715
Trying to transfer the rnedering from displaySide to RenderDeferredTask
2015-06-01 17:31:00 -07:00
Sam Gateau
1b22f1f147
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk
2015-06-01 13:56:13 -07:00
samcake
50f3d2d12b
Merge pull request #5014 from ZappoMan/team-teaching-scene-api
...
TEAM TEACHING - report correct part bounds
2015-06-01 13:55:55 -07:00
ZappoMan
1e2d2a2a99
calculate the actual bounding box for the mesh parts
2015-06-01 13:31:42 -07:00
ZappoMan
750d9c0616
poor mans version of mesh part bounds
2015-06-01 12:53:09 -07:00
Sam Gateau
c8e30ef39e
On to a full rendered pipeline
2015-06-01 12:35:54 -07:00
Sam Gateau
47e15345c3
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk
2015-06-01 12:35:33 -07:00
samcake
98c0cd7d23
Merge pull request #5009 from ZappoMan/team-teaching-scene-api
...
TEAM TEACHING - hacking on rendering mesh parts
2015-06-01 12:24:27 -07:00
Sam Gateau
4bcc71192d
Merge branch 'team-teaching-scene-api' of https://github.com/ZappoMan/hifi into punk
2015-06-01 12:07:16 -07:00
ZappoMan
ea31fdcc26
hacking on transparency
2015-06-01 11:53:40 -07:00
ZappoMan
4b46fc3ad9
cleanup Model::renderPart()
2015-06-01 11:11:27 -07:00
Sam Gateau
9d451c02f1
Merge branch 'team-teaching-scene-api' of https://github.com/ZappoMan/hifi into punk
2015-06-01 11:07:50 -07:00
ZappoMan
1b8572640b
more hacking sams tweaks
2015-06-01 09:07:32 -07:00
Sam Gateau
c10384f91b
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk
2015-05-31 23:20:49 -07:00
Brad Hefta-Gaub
c002a0f990
Merge pull request #5011 from samcake/daft
...
TEAM TEACHING: Adding the update mechanism for the Item's payload of the scene
2015-05-31 20:46:56 -07:00
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
4c817547b7
Merging with Brad's branch and trying to get the rendering working
2015-05-31 14:02:20 -07:00
Sam Gateau
ddec8fd26f
Trying to find a good solution for update message & data
2015-05-30 13:57:05 -07:00
ZappoMan
34fd1bd470
added debugging
2015-05-30 08:45:02 -07:00
ZappoMan
a0683b2847
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api
2015-05-29 21:57:47 -07:00
ZappoMan
0124f98340
more hacking on rendering model parts
2015-05-29 21:56:24 -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
ZappoMan
7ec44dfc88
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching-scene-api
2015-05-29 11:23:31 -07:00
ZappoMan
94f6e8cebd
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api
2015-05-29 11:23:22 -07:00
ZappoMan
dc62052a3c
more hacking on models
2015-05-29 11:07:25 -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
