Commit graph

612 commits

Author SHA1 Message Date
ZappoMan
7c40b666e8 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-06-03 09:52:40 -07:00
ZappoMan
9e7f60e6a3 add more guards against out of bounds 2015-06-02 22:17:39 -07:00
ZappoMan
a7feca0727 more work on making avatar models (face included) use render payloads 2015-06-02 22:10:00 -07:00
ZappoMan
647d132d57 store part boxes in model space and translate to world space on request 2015-06-02 21:50:33 -07:00
ZappoMan
c9c434bc8c Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-06-02 21:04:33 -07:00
ZappoMan
adcb62eb18 more hacking and cleanup 2015-06-02 21:03:34 -07:00
Sam Gateau
8bf08b34d7 Trying to get Ubuntu to build... again 2015-06-02 19:37:54 -07:00
Sam Gateau
eea7ddf491 Trying to get Ubuntu to build 2015-06-02 19:27:32 -07:00
Sam Gateau
640071dd35 Avoiding any setVIewTransform in payloadREnder and introducing monitoring values 2015-06-02 18:23:53 -07:00
ZappoMan
4ce27f1483 first cut at rendering avatars as individual model items 2015-06-02 16:54:47 -07:00
Sam Gateau
903837ab4f exposing some controls on the engine to js for debugging 2015-06-02 15:57:37 -07:00
Sam Gateau
3c7eb4de6d merging with upstream 2015-06-02 14:48:53 -07:00
Sam Gateau
453fa87654 making sure the proj and view matrix are correctly assigned 2015-06-02 14:31:40 -07:00
Sam Gateau
901717fb2c trying to fix the issues of model disappearing 2015-06-02 11:52:22 -07:00
Sam Gateau
ef2d8a0dbe tuesday morning rendering poor performances networking issue 2015-06-02 10:58:56 -07:00
Atlante45
6d234a20ad Hack for unknown pipelines 2015-06-02 19:07:57 +02:00
Sam Gateau
cd7914ad9d Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk 2015-06-01 17:31:39 -07:00
Sam Gateau
bd7c22e715 Trying to transfer the rnedering from displaySide to RenderDeferredTask 2015-06-01 17:31:00 -07:00
ZappoMan
d4af454834 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-01 14:42:35 -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
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
Eric Levin
5cce4edec8 fix merge conflicts attemp 1 2015-06-01 11:18:33 -07:00
ZappoMan
4b46fc3ad9 cleanup Model::renderPart() 2015-06-01 11:11:27 -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
Sam Gateau
4c817547b7 Merging with Brad's branch and trying to get the rendering working 2015-05-31 14:02:20 -07:00
ZappoMan
34fd1bd470 added debugging 2015-05-30 08:45:02 -07:00
ZappoMan
0124f98340 more hacking on rendering model parts 2015-05-29 21:56:24 -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
Brad Davis
f98305dd55 CR comments 2015-05-29 12:45:03 -07:00
ZappoMan
dc62052a3c more hacking on models 2015-05-29 11:07:25 -07:00
ZappoMan
78c701a89d Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-05-29 08:40:46 -07:00
Atlante45
212007aa6f Cleanup simple fragmen shaders 2015-05-29 16:53:53 +02:00
Atlante45
51570aac68 Add simple textured pipeline 2015-05-29 16:49:31 +02:00
ZappoMan
eb19b93433 render models in scene checkpoint 2015-05-28 17:19:30 -07:00
Eric Levin
533148f26d line being sent as array 2015-05-28 15:48:31 -07:00
Eric Levin
72af4e4e67 latest pointer 2015-05-28 10:44:44 -07:00
Atlante45
bca80addef Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into text-renderer 2015-05-28 16:13:24 +02:00
Atlante45
b0cbf5c51a Adjust wraping with offset 2015-05-28 16:06:18 +02:00
Atlante45
ca529e4bb8 Remove debug/tweak sampler 2015-05-28 15:58:40 +02:00
Atlante45
12d75481e5 Introducing TextRenderer3D 2015-05-28 15:43:16 +02:00
Atlante45
c4ab18736d Restore TextRenderer and sdf_text 2015-05-28 15:20:40 +02:00
Atlante45
10c2f3f561 More TextRenderer work 2015-05-28 14:51:57 +02:00
ZappoMan
8c9cf480f3 more hacking 2015-05-27 13:23:59 -07:00