Commit graph

983 commits

Author SHA1 Message Date
Niraj Venkat
aa55de46c2 Drawing full bounding box 2015-06-30 16:09:45 -07:00
Sam Gateau
8bd5e15f73 Exposing the viewport to the shader and have a first draft of the draw status pipeline 2015-06-30 14:43:57 -07:00
Niraj Venkat
0ea2774d6e Merge branch 'yellow' of https://github.com/samcake/hifi into stats 2015-06-30 10:46:07 -07:00
Sam Gateau
20cb519c14 first draft at using the status of the item for representing stats and current data about it in the DrawStatus phase 2015-06-30 08:19:00 -07:00
Niraj Venkat
d7791982ac Starting stats branch 2015-06-29 15:19:50 -07:00
Sam Gateau
5a2d2485c0 Fix the cookie cutter problem in stereo, the alphaThreshold wasn 't assigned correctly for opaque 2015-06-19 16:30:48 +02:00
Sam Gateau
31633eca10 IMproving the probe system and cleaning the engine script 2015-06-19 10:41:40 +02:00
Sam Gateau
fb42613344 Fixing transparency that i just broke 2015-06-18 20:25:51 +02:00
samcake
89fe1c47be preping for debug the jobs 2015-06-18 13:02:06 +02:00
samcake
cc65ad3ffb IMproving the JOb interface 2015-06-17 15:52:11 +02:00
Sam Gateau
d1ac3148f0 migrating the transparent pipeline 2015-06-16 17:33:53 +02:00
Sam Gateau
b1ff877af1 trying to improve something ? 2015-06-16 15:56:38 +02:00
Sam Gateau
9be87758fd Improving the design of the Jobs and varying 2015-06-16 15:00:47 +02:00
Sam Gateau
38694e4f65 Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-06-14 18:56:34 +02:00
Ryan Huffman
81d003bdb8 Add post-scale to view matrix when in mirror mode 2015-06-12 13:05:10 -07:00
Ryan Huffman
ad77374732 Fix setting of _renderMode 2015-06-12 13:03:33 -07:00
Sam Gateau
09e12f93b3 Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-06-12 17:17:32 +02:00
Sam Gateau
bacdaf416f Working on the Job input/output mechanism 2015-06-12 17:15:41 +02:00
Brad Hefta-Gaub
a1ee339765 Merge pull request #5103 from samcake/punk
TEAM TEACHING : Repair the Overlay 3D rendering and introduce the concept of layer in the scene
2015-06-11 10:17:38 -07:00
Andrew Meadows
7d0000c537 fix warning about returning ref to temp variable 2015-06-11 08:38:03 -07:00
Sam Gateau
7685fe2229 Clean up on the item interface and introduction of the Layered concept, fixing the highliting box of the edit tool 2015-06-11 06:40:21 -07:00
Sam Gateau
2785f1a0e2 Fixing the blackout when entering a zone with a skybox thatis not loaded yet or just a constant color skybox 2015-06-10 01:50:52 -07:00
Sam Gateau
dd84bf010b Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-06-10 00:32:22 -07:00
Sam Gateau
7de4c2eff7 first take on the materialKey 2015-06-09 12:17:10 -07:00
Seth Alves
983ae5b2f0 quiet compiler, fix some whitespace 2015-06-08 21:19:37 -07:00
ZappoMan
26ef6af009 use emplace_back and pre-reserved sizes for vectors 2015-06-08 12:45:39 -07:00
ZappoMan
84c37bd301 cache bounds with item ids in DrawTask 2015-06-08 09:05:16 -07:00
ZappoMan
46a8b831fc cache bounds with item ids in DrawTask 2015-06-08 09:01:12 -07:00
ZappoMan
08ea3368d7 hacking on DrawTask perf 2015-06-05 13:10:51 -07:00
Clément Brisset
f19c0d8eec Some renaming for windows compiler 2015-06-05 13:23:58 +01:00
Atlante45
93b44e6846 Collect stats on translucent/opaque mesh parts 2015-06-04 18:46:47 +02:00
Atlante45
a4340b17e9 Remove deprecated render stats 2015-06-04 14:47:04 +02:00
Atlante45
96be60c0cf Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod 2015-06-04 14:22:12 +02:00
Sam Gateau
730d455095 adding a debug tool 2015-06-03 11:35:37 -07:00
Sam Gateau
b339aa683a adding caps for opaque and transparent draw jobs and the ui in js so we can debug the rendered items 2015-06-03 11:25:45 -07:00
Atlante45
9df1b05184 Introduce outsideEngineDetails 2015-06-03 18:08:43 +02:00
Atlante45
bbf1837796 Introduced RenderDetails/Stats don't pull details
- Regrouped everything stat in a struct
	- Details are set into the stats
2015-06-03 16:14:23 +02:00
Sam Gateau
640071dd35 Avoiding any setVIewTransform in payloadREnder and introducing monitoring values 2015-06-02 18:23:53 -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
ef2d8a0dbe tuesday morning rendering poor performances networking issue 2015-06-02 10:58:56 -07:00
Atlante45
d431a1b522 Remove comment 2015-06-02 19:28:05 +02:00
Atlante45
9d4ded1fb3 Add shouldRender functor to render args 2015-06-02 16:09:05 +02:00
Sam Gateau
bd7c22e715 Trying to transfer the rnedering from displaySide to RenderDeferredTask 2015-06-01 17:31:00 -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
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
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
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
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
Ryan Huffman
b2c503af0e Add NO_DEPTH_SORT ItemKey flag 2015-05-29 08:52:37 -07:00
Sam Gateau
3f8bdc14c4 reinserting culling, lod and depth sort to the rendering 2015-05-28 18:01:31 -07:00
ZappoMan
2fba5a0928 more work on simple renderable 2015-05-28 12:19:43 -07:00
Sam Gateau
2cbd049e4e adding the concept of job 2015-05-28 12:02:57 -07:00
ZappoMan
b0cc536f53 debug cleanup 2015-05-27 16:55:02 -07:00
ZappoMan
37a291275d more work on rendering in engine 2015-05-27 16:46:44 -07:00
ZappoMan
61712a6ac3 add some debugging streamers for some scene classes 2015-05-27 15:29:35 -07:00
ZappoMan
8c9cf480f3 more hacking 2015-05-27 13:23:59 -07:00
ZappoMan
4654ed95ac Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-05-27 10:40:24 -07:00
Sam Gateau
a5c5cc9b70 First Item really rendering , for the WorldBox, desigining more of the RenderContext and task interface 2015-05-27 01:15:14 -07:00
ZappoMan
2f6a3a61d7 reorder headers to match coding standard 2015-05-26 16:31:15 -07:00
ZappoMan
25823bedd1 Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-05-26 15:51:46 -07:00
samcake
dd9d758da1 Fixing the compilation issue for real 2015-05-26 10:53:23 -07:00
Sam Gateau
35b8d45bee Insert a first scene and the engine in the Application and render a first Item 2015-05-24 17:03:43 -07:00
ZappoMan
4bdeef7610 checkpoint 2015-05-22 14:54:30 -07:00
samcake
c6b20da8b5 fix typos 2015-05-22 13:12:03 -07:00
Sam Gateau
e7e3eb2b7c FIrst version of the design for the Engine, the Tasks and a DrawTask. Introduced the ItemFilter 2015-05-22 12:58:18 -07:00
Sam Gateau
bec8d1838c Adding th etask class 2015-05-21 17:12:01 -07:00
ZappoMan
0d9f0f609b first cut at RenderableEnitityItem payload 2015-05-21 16:22:23 -07:00
Sam Gateau
a87d2927f1 FIxing typos and refining naming again, getting ready to use a Payload 2015-05-21 15:27:55 -07:00
Sam Gateau
f0daa3ebcb Refining the namings, creating the bucketing system, making a first example 2015-05-21 12:06:47 -07:00
Sam Gateau
8f9a1d1074 THursday morning commit before merging with teaching team 2015-05-21 09:45:48 -07:00
samcake
22c99d02b9 FIxing the Render::Item compilation on mac 2015-05-20 18:07:17 -07:00
Sam Gateau
1a59f4a97c fix typo 2015-05-20 17:08:19 -07:00
Sam Gateau
3893dff94f Renaming the PendingChanges 2015-05-20 16:59:10 -07:00
Sam Gateau
c6bd1ee671 drafting the render engine 2015-03-05 16:57:10 -08:00
Sam Gateau
0c9c60dd65 adding the render engine 2015-03-04 09:54:07 -08:00
Sam Gateau
66894a8fda Adding the render library that will provide the base rendering engine and scene description 2015-03-03 14:55:26 -08:00