Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-20 15:24:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
86988 commits 6 branches 1 tag 1.1 GiB
Commit graph

986 commits

Author SHA1 Message Date
Brad Davis
6fc82bb351 Switch to preprocessor macro for blocking invokes to capture function information 2017-06-30 11:36:24 -07:00
Olivier Prat
87833abd31 Sky working again. 2017-06-30 16:46:25 +02:00
Brad Davis
b52dd7b822 Don't use blocking connections on the main thread 2017-06-29 20:45:17 -07:00
Olivier Prat
6a31dc2659 Selection of edited object working 2017-06-29 12:13:55 +02:00
Olivier Prat
8a12d0c106 Fade effect working again for basic enter domain but with various Fade jobs 2017-06-29 08:54:23 +02:00
Sam Gateau
93963b3257 Apply the projection and deferred transform fixes found while working on spectator camera 2017-06-28 15:44:17 +02:00
Sam Gateau
904f22985c CLeaning up comments 2017-06-26 16:43:04 +02:00
Olivier Prat
1bb0d51849 Merged with master 2017-06-26 11:55:46 +02:00
samcake
20d8c11e28 ALmost there, getting eback everything to work with the light and background stages in the scene, not in deferredLighting Effect anymore 2017-06-22 17:54:16 -07:00
Sam Cake
07e18eb3a8 Keep cleaning up the DeferredLightingEffect , removing stage s from there... 2017-06-22 01:12:32 -07:00
samcake
9ae2861ee6 Moving the stage objects under the scene umbrella and creating a cear task to update the scene elements 2017-06-21 18:29:38 -07:00
samcake
56d5f4ec5c Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-06-21 11:25:07 -07:00
Sam Cake
09529f6592 One more refinemnt of the comment 2017-06-21 00:54:04 -07:00
Sam Cake
484aeed589 More comments on the getCOnfig call 2017-06-21 00:36:03 -07:00
Sam Cake
c35be446e6 adding profiling on the script engine call back to timer event 2017-06-21 00:06:45 -07:00
samcake
d853a76376 Fixing the scripts and investigating the scripting 2017-06-20 17:23:44 -07:00
Sam Cake
5b6f6ab84f Trying to fix the getCOnfig from QML... 2017-06-20 00:25:51 -07:00
samcake
653ce89e08 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-06-19 15:48:46 -07:00
Zach Fox
cbdffce88e Merge branch 'master' of https://github.com/highfidelity/hifi into spectatorCamera_mergeable_20170619 2017-06-19 13:53:29 -07:00
Brad Davis
a69cf31f4b PR feedback and cmake fixes 2017-06-16 16:59:58 -07:00
Brad Davis
fece438602 Cleanup and refactoring 2017-06-15 18:58:56 -07:00
Sam Cake
df340a5b55 COmpiling 2017-06-14 22:39:47 -07:00
samcake
d8380923f0 Introducing the SCeneUpdtate job to the engine to take care of performing transactions and introducing the stages 2017-06-14 18:06:42 -07:00
Olivier Prat
24d45e0f5b Updated from upstream master because of change of protocol 2017-06-13 10:43:25 +02:00
Olivier Prat
7d58c9a741 Fixed fade for shadow job 2017-06-08 17:09:08 +02:00
Olivier Prat
cba70e6be0 Fade working on voxel objects 2017-06-08 14:57:09 +02:00
samcake
bac66ee4c7 Introducing the renderview task 2017-06-06 18:00:41 -07:00
Olivier Prat
1433ae4b34 Merged from 21274 2017-06-05 11:12:57 +02:00
Sam Cake
1f090d8148 Debugging the size problem and fixing the compression size evaluation 2017-05-22 01:00:34 -07:00
samcake
c449229850 Cleaned up the counters for memory 2017-05-19 17:52:56 -07:00
samcake
80b6fd65ae Cleaning up counters and naming schemes... 2017-05-17 18:31:28 -07:00
samcake
b466964817 REvisiting the stats counter for the gpu context in the hope of better understanding the gpu texture streaming behavior 2017-05-16 18:21:24 -07:00
Sam Gateau
ff3cf7801a Merge branch 'master' into 21274 2017-05-09 11:48:57 -07:00
samcake
4514da2a09 Merge branch 'master' of https://github.com/highfidelity/hifi into ambient 2017-05-01 16:49:35 -07:00
Olivier Prat
8071c04e98 Added fade effect prototype version 2017-04-27 10:31:06 +02:00
Atlante45
ad16a935e9 Texture::create returns shared pointer 2017-04-25 15:56:23 -07:00
samcake
c36f8da4c0 Fixing build on mac 2017-04-24 10:46:29 -07:00
Sam Cake
33d770c24e removing the explicit SettingHandle path to REnder?engine 2017-04-24 00:52:09 -07:00
Sam Cake
fa62a1ba9d Merge branch 'master' of https://github.com/highfidelity/hifi into ambient 2017-04-22 08:53:44 -07:00
Sam Cake
3691be4a2f PUshing function to cpp 2017-04-22 08:53:13 -07:00
samcake
8e73fa3eb4 Separating the task classes in their own folder, and easing the declaration 2017-04-21 18:16:07 -07:00
sam gateau
733e268391 FIx the SSBO usage on amd, needed a bit more explanation on the glsl side 2017-04-21 16:17:18 -07:00
sam gateau
0a615f35a7 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-04-21 14:31:15 -07:00
Sam Cake
321d281919 Separating job/task classes from the render specific 2017-04-21 01:46:44 -07:00
samcake
63fe579022 simply removing the SceneContext from the engine/task run call since we never used it and can unify into the RenderContext instead' 2017-04-18 17:05:40 -07:00
Sam Cake
61ed5c3ce9 THank you mac 2017-04-15 01:35:28 -07:00
Sam Cake
038d01ce04 Avoiding temp variable reference to appease mac and fixing a warning 2017-04-15 00:45:50 -07:00
Sam Cake
96960a505d COmpleted the Resource Buffer, compilation and binding works. Now need to help on the shader side 2017-04-14 23:22:45 -07:00
Sam Cake
bb15b8c701 ANd fixing the gl41 rendering 2017-04-14 00:46:41 -07:00
Sam Cake
29545f0918 FInally bringing all the shader compilation related fuinctions in the Backend in the same cpp, making specialized version based on the Backend 2017-04-13 23:53:56 -07:00
Sam Cake
78bfc006f1 Prototyping the ResourceBuffer with the DrawBounds Job, yeah 2017-04-13 00:51:02 -07:00
samcake
d41f34ce8d Adding support for the resource buffer 2017-04-12 19:07:27 -07:00
samcake
5daf365784 Avoiding warning maybe 2017-04-11 12:15:30 -07:00
samcake
612acbc6d5 Avoid pointers on temp var 2017-04-11 10:56:58 -07:00
Sam Cake
1dd98af1dd And introduce a clean sorted select of the items so we keep the order of rendering of the boxes of the zone in the ZOne stack order, the color of box reflect the order (from red to blue) 2017-04-11 01:21:45 -07:00
Sam Cake
80c781bcdc Fixing warning on mac and more description of the Task class 2017-04-10 22:17:12 -07:00
Sam Cake
5d7accca2b Avoiding the mac compilation problem maybe 2017-04-10 21:12:00 -07:00
samcake
4a47737d0b REfining the Config behavior, trying to pr next 2017-04-10 19:01:49 -07:00
Sam Cake
e7fb18bd2f MOving forward with the TaskConcept and TaskModel, all working 2017-04-10 02:51:19 -07:00
Sam Cake
a458828590 MOving forward with the TaskConcept and TaskModel, all working 2017-04-10 02:30:13 -07:00
Sam Cake
b65448bcbe Trying to improve the Job/Task classes and testing it with the ZoneRenderer 2017-04-09 11:08:35 -07:00
samcake
e6844f4294 Cleaning up the basic jobs of render 2017-04-07 18:35:27 -07:00
samcake
6fc965072c Adding the Selection, and not the Tag concept fro real, and beeing able to reset it from the Transaction and simply communicating the ranked zones to the engine through a selection, ready to be used by the ZOneREnderer 2017-04-06 15:19:55 -07:00
samcake
91f315f9ce Adding the concept of selection to the scene 2017-04-06 11:27:48 -07:00
samcake
b8cb79113e Nitpicking on the correct name maybe... 2017-04-06 10:30:24 -07:00
samcake
3de760abcb Introduucing the tag to the scene 2017-04-05 18:35:06 -07:00
samcake
8267db6ce5 Add a description of the Transaction class 2017-04-05 14:19:00 -07:00
samcake
026e7bc249 Add a description of the Transaction class 2017-04-05 14:17:26 -07:00
samcake
5629cf425e Cleaning up the files updated 2017-04-05 13:49:07 -07:00
samcake
6122155880 Renaming the PendingCHanges class to Transaction 2017-04-05 13:10:31 -07:00
Sam Cake
dd73cb7b8e Use a magic number gpu::Texture::SINGLE_MIP instead of 1 2017-03-30 23:46:37 -07:00
samcake
b6504bba56 Moving the num mips per texture to the creator so it s immutable and simpler 2017-03-29 17:58:56 -07:00
Brad Davis
85c80f3be8 Merge remote-tracking branch 'upstream/master' into smarter_textures 
Conflicts:
	libraries/gpu/src/gpu/Texture.cpp
 2017-03-22 14:25:23 -07:00
Brad Davis
e482eac437 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-20 16:22:13 -07:00
trent
3b8636b75c Doubled-ish the size of the physics status icons, fixed texture coordinates to be right-side up. 2017-03-20 17:55:52 -04:00
samcake
0399249a03 Expeand the wireframe to the primitive entities and the polyvox 2017-03-15 16:58:31 -07:00
samcake
ea2f1359bc Expose rendering in wireframe mode 2017-03-15 12:23:44 -07:00
Brad Davis
8782fe1d93 Merge branch 'master' into smarter_textures 
Conflicts:
	libraries/model-networking/src/model-networking/TextureCache.cpp
 2017-03-06 15:29:41 -08:00
sam
5257194c48 SImplify the overlay PLumber 2017-02-24 01:11:59 -08:00
sam
e1aad8bd63 Deep dive into the shape key and filters and the PLumber construction 2017-02-24 00:35:10 -08:00
sam
67031850aa Deep dive into the shape key and filters and the PLumber construction 2017-02-24 00:05:54 -08:00
samcake
c7b164d8f2 Adding differenciation for the Material shapeKey bit 2017-02-22 18:21:18 -08:00
samcake
3cd422e508 Last clean up 2017-02-21 15:02:12 -08:00
samcake
55611d2373 Backing up to master 2017-02-21 14:56:07 -08:00
sam
d56f982dec Maybe saving the first ktx textures, testing the save pipeline 2017-02-17 07:54:17 -08:00
samcake
37541e4ed2 Start capping the time budget for draw opaque 2017-02-10 14:29:29 -08:00
Anthony J. Thibault
a9b478888c First cut of Web3DOverlays without FXAA applied. 2017-01-30 11:24:58 -08:00
samcake
027bd30cbc Removing macOS warning 2017-01-18 16:59:50 -08:00
samcake
e3da6aa9f1 Removing the comment 2017-01-18 15:03:31 -08:00
samcake
305e308575 avoiding the exclusive filtering behavior 2017-01-17 10:54:45 -08:00
samcake
960f4f0ead Move the drawBOunds job to DrawTasks 2017-01-16 18:33:42 -08:00
samcake
83d1c3ad01 Adding support for the meta rendering 2017-01-16 17:47:58 -08:00
Zach Pomerantz
e406e3d47e Make Forward DrawBounds enableable 2017-01-03 14:46:51 -05:00
Zach Pomerantz
26cfc83e20 Merge branch 'master' into graphics/fetch-cull-sort 2017-01-03 14:04:39 -05:00
Zach Pomerantz
15656a0592 include spatialSelection in RenderFetchCullSortTask::Output 2016-12-30 15:08:16 -05:00
Zach Pomerantz
0e9da87549 FetchSortCull->FetchCullSort 2016-12-29 19:27:37 -05:00
Brad Davis
901c020aae Optimizations, SIMD and const correctness 2016-12-27 15:39:38 -08:00
Zach Pomerantz
ca1a14e5b0 add RenderFetchSortCull task 2016-12-23 15:54:22 -05:00
Zach Pomerantz
0fa3439949 add setOutput for graphics engine tasks 2016-12-23 15:35:28 -05:00
Zach Pomerantz
8d63067fa5 templatize graphics engine tasks' run method 2016-12-23 14:58:40 -05:00
Brad Hefta-Gaub
dbbed462b4 cleanup naked qDebug() calls 2016-12-19 22:24:25 -08:00
Brad Davis
30a9961362 tracing polish 2016-12-16 14:02:27 -08:00
Ryan Huffman
7bb2755913 Add chrome tracing support 2016-12-16 01:14:01 -08:00
samcake
9031e65aa5 Merge and fix the bug!!! 2016-11-16 19:12:56 -08:00
sam
bcef138545 FIx the context stats 2016-11-04 18:59:30 -07:00
samcake
f274ef1a59 Merging back with upstream and trying to fix counter for them to be more stable 2016-11-04 16:56:03 -07:00
samcake
6926cd274c Merge with upstream 2016-11-02 18:15:08 -07:00
Anthony Thibault
23aa626755 Destroy render scene & engine before Application is destroyed 
Many render items/payloads contain smart pointers back to the
objects that added them to the scene, including entity and avatar
objects. Currently, those render items are destroyed when the
scene is destroyed very late in the application life-cycle.

There are rare crashes that can occur when these render items are
destroyed. Possibly, due to them referencing objects that have
already been destroyed via raw pointers. In an effort to
eliminate these crashes, we now destroy the scene earlier, within
Application::aboutToQuit() which is connected to the
QCoreApplication::aboutToQuit signal.  Also, we guard against null
scene pointer dereferences.  Any location that accesses the scene
off the main thread, now checks the validity of the scene pointer.
 2016-10-25 15:28:37 -07:00
Zach Pomerantz
cf82cc3f50 fix invalid ShapeKey ref 2016-10-18 17:59:30 -07:00
Brad Davis
28771cbda9 Additional plugin debugging, better plugin resource cleanup 2016-10-11 19:40:02 -07:00
sam
567adf651a FOund 2 bugs causing the empty clusters. now back to working 2016-10-07 05:02:04 -07:00
samcake
5b4829e7b6 Brining back support for the ambinet lighting 2016-09-30 16:24:57 -07:00
samcake
9b94a025fc Refining the voxelization of the sphere in the view frustum grid 2016-09-26 18:41:53 -07:00
Brad Davis
82db3d5d55 Disable support for framebuffer resizing 2016-09-23 12:04:57 -07:00
samcake
7a7a60a5c4 INtroducing a true stage for updating the light cluster and ui to debug 2016-09-11 00:17:34 -07:00
samcake
a0d09e3316 Fixing the vizualisation shader for world to cluster space 2016-09-10 10:14:31 -07:00
samcake
edb456aa8f ANd again 2016-09-06 17:16:54 -07:00
samcake
1165c54f67 cleaning up the IndexedContainer in its own file and removing warnings 2016-09-06 16:24:03 -07:00
Brad Hefta-Gaub
8ec5798b7a Merge pull request #8548 from samcake/blue 
Exposing GPU & Batch running time to Engine gpu jobs
 2016-09-02 09:31:09 -07:00
samcake
0c0109e427 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-09-01 15:20:34 -07:00
Stephen Birarda
7c45ed043e fix solo render compile 2016-08-31 14:08:46 -07:00
samcake
2a5ee5d6b1 Fixing the unit for the cpuTIme feed and the titles for the GPU PERf Plots 2016-08-30 14:28:52 -07:00
samcake
faef8a9930 Adding the timing for GPU support with a simpelr JobConfig 2016-08-30 12:22:21 -07:00
Seth Alves
09b7a5188c a few more 2016-08-18 10:15:35 -07:00
Seth Alves
87dbfa7e47 add -Wsuggest-override to compile flags and deal with fallout 2016-08-18 09:51:41 -07:00
Brad Davis
6d7edd38cc Rename clearViewTransform 2016-08-12 22:28:59 -07:00
Brad Davis
adcfd55cc0 Batch replay reprojection 2016-08-12 22:28:23 -07:00
Bradley Austin Davis
274321de8a First pass at threaded rendering 2016-08-12 22:18:36 -07:00
SamGondelman
676f4bdfcf misc fixes from particles branch 2016-07-29 15:36:32 -07:00
samcake
2618741505 Merging with upstream master and updating my old PR 2016-07-21 17:59:00 -07:00
samcake
8f663f20e0 FIx warnings 2016-07-19 13:24:03 -07:00
samcake
4742f40128 Separating the normal packing into it s own file and make sure to sclae the filter radius correctly dpeending on the resolution of diffusion 2016-07-19 12:23:57 -07:00
samcake
ff132fa712 Gathering the diffusion passes in the SUrfaceGEometryPAss job 2016-07-19 02:11:22 -07:00
samcake
a8dd06ad38 Better groupint of the diffuseion of the curvature for easier fix for mini mirror 2016-07-18 19:24:43 -07:00
samcake
34f2a96888 Adding the check for Obscurrance 2016-07-18 18:11:51 -07:00
samcake
5a0ce81516 Performing the curvature generation and diffusion at half the resolution 2016-07-18 03:54:05 -07:00
samcake
378f4576fa a bit better making the curvature and diffusion passes 2016-07-17 20:18:06 -07:00
samcake
9332f82d54 Carrefully improving the curvature generation performances 2016-07-17 17:13:07 -07:00
samcake
c45f810622 Fixing the mac build 2016-07-14 16:43:56 -07:00
samcake
776bcb6655 FIxing the web entity rendering 2016-07-14 15:49:49 -07:00
Zach Pomerantz
e71a2097a5 update doc for task template 2016-07-14 13:19:49 -07:00
Zach Pomerantz
e4dabc6be4 fix task config initialization 2016-07-14 13:16:19 -07:00
samcake
3ab56062d4 Address some warnings and syntax issues 2016-07-14 12:06:02 -07:00
samcake
a42f9a5d0e FIxing the mini mirror perf issue and the gamma correction 2016-07-14 10:53:13 -07:00
samcake
b9a2b2778e Adding the support for the subregion in the blur passes to apply it correctly to mini mirror 2016-07-13 18:53:37 -07:00
samcake
51594fefa2 more clean up 2016-07-12 18:21:31 -07:00
samcake
cde17ecaab Clenaing the rendering and the framebuffer allocations 2016-07-12 14:34:54 -07:00
samcake
ba7590712a BRinging the intermediate render textures in the pipeline as varyings and not throug the singletonn anymore 2016-07-11 18:33:57 -07:00
samcake
fa62a0a73c One less warning 2016-07-07 18:05:36 -07:00
samcake
8f2bf2b423 Integrating the scattering to the local lights 2016-07-06 17:13:16 -07:00
samcake
2a52f1db7f Adding the lighting model class to configure accross the jobs the lighting 2016-07-01 18:36:51 -07:00
samcake
ab21a5a5d5 FIxing the bad brdf and adding better debug tool and better Pipeline architecture 2016-06-29 18:59:06 -07:00
samcake
d128af48db Fix the curvature issue in stereo by evaluating in the mono clip space, not stereo. INtegrate the scattering in simple ambient without IBL 2016-06-28 13:47:55 -07:00
samcake
197d49fc03 introducing the depth aware blur 2016-06-27 17:04:37 -07:00
samcake
884b9211c6 Curvature is looking correct now without artefact, moving on to the lighting 2016-06-23 17:13:48 -07:00
samcake
3ec14fd746 MErging and still trying to understand the curvature isssue 2016-06-22 18:06:55 -07:00
samcake
40a4e72f73 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-06-15 15:14:19 -07:00
samcake
e31a3b4d08 After trying stop trying to expose a generic [] operator on Varying and Containers 2016-06-15 15:13:51 -07:00
samcake
42eaaf742d Protoype done 2016-06-14 18:29:06 -07:00
samcake
8858f9dc82 IUse the light stage finally for the scattering prototype 2016-06-14 09:54:51 -07:00
samcake
414c43c012 Current state 2016-06-13 19:10:50 -07:00
samcake
f69c72f984 Fixing the VaryingPair problem 2016-06-13 10:44:31 -07:00
samcake
6a5dff06c4 Pushing a shitty state where the pairs of Varyings don;t get copied correctly 2016-06-13 09:46:24 -07:00
samcake
c325cc50dd Adding the depth aware blur 2016-06-11 18:54:22 -07:00
samcake
28886f6ec3 Many improvments 2016-06-10 17:18:12 -07:00
SamGondelman
8a682450a9 still trying to fix cmake errors 2016-06-10 17:01:22 -07:00
samcake
e69022285e A lot more stuff to try to see the skin scattering 2016-06-08 18:58:50 -07:00
samcake
75a5f6bd89 Intoducing the bluring as a separate Job reusable and the first version of curvature 2016-06-07 18:13:40 -07:00
samcake
c627a555bf Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-05-16 16:27:51 -07:00
Seth Alves
2a5efd3b82 Merge branch 'master' of github.com:highfidelity/hifi into update-model-meta 2016-05-16 10:53:39 -07:00
Brad Davis
9509e32928 PR feedback 2016-05-14 08:28:51 -07:00
Seth Alves
970e7ca17d don't crash when a moving model entity is deleted 2016-05-13 13:32:00 -07:00
samcake
c6a081fb46 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-05-11 16:56:37 -07:00
samcake
e40a795a27 Trying to clean up for pr 2016-05-10 19:25:22 -07:00
samcake
303cade547 Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-05-10 09:56:05 -07:00
samcake
8bad58749c Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-05-06 09:51:37 -07:00
Andrew Meadows
d1591e03b9 fix typo 2016-05-05 18:28:27 -07:00
Andrew Meadows
71b2d647e8 add locks and explicitly copy ViewFrustums 2016-05-05 18:28:27 -07:00
Andrew Meadows
bcf2cc8074 use references not pointers for ViewFrustums 
also unravelling some spaghetti:
(1) split Octree stuff out of ViewFrustum
(2) moved ViewFrustum from octree to shared lib
(3) removed some cruft
 2016-05-05 18:28:27 -07:00
Andrew Meadows
60a72c6660 getViewFrustum() provides const pointer 2016-05-05 18:28:27 -07:00
samcake
e306a24a1b INtroducing the unlit mode for fragments 2016-05-05 17:08:52 -07:00
Brad Hefta-Gaub
1e30ba43ea Merge pull request #7781 from zzmp/log/pipeline-flood 
Avoid missing pipeline log flood
 2016-05-05 00:15:10 -07:00
Brad Hefta-Gaub
bbf358f81d Merge pull request #7796 from samcake/blue 
Improve Translucent shapes global lighting with support for the ambient map reflection
 2016-05-03 11:14:06 -07:00
Zach Pomerantz
0bc89d6b18 Avoid missing pipeline log flood 2016-05-03 09:39:31 -07:00
samcake
88f816fab4 Adding reflection of the ambient map for translucent 2016-04-28 18:18:18 -07:00
Zach Pomerantz
2f20e58301 Avoid crashing on missed pipelines 2016-04-27 19:54:52 -07:00
samcake
4202e60ac3 trying to add the skymap on translucents 2016-04-26 18:20:15 -07:00
samcake
fa28286274 Merge with master and include fix to debus eception, still crashing on particular drawcalls when in stereo? 2016-04-26 15:26:56 -07:00
samcake
5cb346330b Merging with master 2016-04-25 18:48:58 -07:00
samcake
fd3efa37e3 Cleanup the shaders to avoid any uniform in genral, fixed a bug woith the emissive params applied twice for model_lightmap.slf 2016-04-22 10:56:21 -07:00
samcake
5a67411d75 Removing separate uniforms for the texcoord transforms and lightmap params, shader still failing 2016-04-21 18:35:37 -07:00
samcake
fb363180c8 Starting to expose the number of changes to the input format 2016-04-19 12:03:57 -07:00
samcake
28521aa66a REmoving uneeded changes 2016-04-19 11:01:41 -07:00
samcake
265f6f1275 Updating & Merging with master 2016-04-19 10:05:44 -07:00
Brad Hefta-Gaub
5d550197bd Merge pull request #7697 from samcake/orange 
Introduce a simple state sort for drawing opaque items
 2016-04-19 08:41:49 -07:00
samcake
9087de22bd Fixing the extra spaces 2016-04-18 16:10:11 -07:00
samcake
ca720efce6 Exposing the timing of the jobs by default 2016-04-18 14:53:06 -07:00
samcake
0ae54b9abc Typo 2016-04-18 11:45:48 -07:00
samcake
d746fba142 Cleaning up the stats.qml 2016-04-18 11:18:28 -07:00
samcake
88c58cc276 Adding the simple state sort to draw opaque deferred 2016-04-18 10:51:31 -07:00
samcake
0531f90675 Adding state sorting for free 2016-04-18 00:22:05 -07:00
samcake
ff1df0d45e Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-04-12 15:29:58 -07:00
samcake
ab9f41f5eb Trying something a bit more radical for timing 2016-04-12 15:29:31 -07:00
samcake
710c4a1b8f TRying to merge and expose counters for in flights transfers 2016-04-05 12:18:30 -07:00
samcake
9d1f91fa19 First pass at using compressed format when uploading textures 2016-03-31 19:27:35 -07:00
Anthony Thibault
26b9469df5 Merge pull request #7516 from hyperlogic/tony/show-collision-geometry-crash-fix 
Model: fix for crash when displaying collision mesh
 2016-03-30 16:48:07 -07:00
samcake
6213e0859d Expose to counters fro drawcalls, one for the API drawcalls and the other for gpu drawcalls spawned 2016-03-30 15:07:45 -07:00
Anthony J. Thibault
103257493c Model: fix for crash when displaying collision mesh. 
This was due to a default constructed PayloadPointer being sent to the scene via resetItem.

The fix is to A) not do that anymore, B) make resetItem more robust and not crash if this happens.
 2016-03-30 14:24:28 -07:00
samcake
be27eaff24 Moving the scripts for render that where in utilities/tools/render to utilities/render, adding counters for lights 2016-03-29 17:51:24 -07:00
samcake
aa085f6955 Putting members of the ENgineStats class NOT public so they can keep their name proudly 2016-03-28 11:52:31 -07:00
samcake
5a3896b1de FIxing warnigns 2016-03-27 09:35:13 -07:00
samcake
7361304084 Cleaning up for review 2016-03-25 18:38:52 -07:00
samcake
c23640249e Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-03-25 15:29:01 -07:00
samcake
9b58d50fd4 BUilding a more complete set of tools to monitor performances 2016-03-25 15:28:06 -07:00
Anthony J. Thibault
c00a412d3b Fix misleading comments for _skipCulling case. 2016-03-25 09:10:46 -07:00
samcake
9fb1a9a2a8 Merge and many more counters 2016-03-25 03:02:18 -07:00
Anthony J. Thibault
c302c803b0 CullTask: added ability to disable culling during rendering. 
You can use the following JavaScript to disable culling:

    Render.RenderDeferredTask.CullSceneSelection.skipCulling = true
 2016-03-24 13:20:29 -07:00
samcake
138a996013 First draft of monitoring the memeory consumption 2016-03-23 15:46:17 -07:00
Zach Pomerantz
ff0862b594 Emplace render engine jobs 2016-03-14 17:51:43 -07:00
samcake
729890342e Fixing the linux warning for unused variable 2016-03-11 00:27:56 -08:00
samcake
24d712b7b4 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-03-10 18:14:22 -08:00
samcake
58b84b67ea Fixing the outside the octree bug 2016-03-10 18:14:11 -08:00
samcake
a88f22fa3c Removing white spaces 2016-03-10 15:58:04 -08:00
samcake
fb68c09941 Before merging upstream 2016-03-10 15:10:34 -08:00
samcake
3944a7f297 Exposing thread safe number of allocated items for a ascene 2016-03-10 15:03:20 -08:00
samcake
f6276615f7 Trying to fix the bound out of the octree volume problem 2016-03-10 09:31:05 -08:00
Zach Pomerantz
d1324b2e7a Merge branch 'master' of github.com:highfidelity/hifi into fix/resort-in-octree 2016-03-08 10:22:25 -08:00
samcake
9fb318570b Ajusting the pure Ambient SH lighting pass and more review issues 2016-03-01 12:24:44 -08:00
Zach Pomerantz
30fbd99d11 Factor out SortTask to fix shadows 2016-02-26 16:04:15 -08:00
Zach Pomerantz
56aac35348 Fix drawInFront bugs 2016-02-26 15:24:37 -08:00
Zach Pomerantz
5995c3717f Continue updating overlay key on edit 2016-02-26 14:46:42 -08:00
Zach Pomerantz
2cd6706a6a Update fetch to use nonspatialSet 2016-02-26 14:46:42 -08:00
Zach Pomerantz
8e1c514a9c Replace scene buckets with nonspatial set 2016-02-26 14:46:40 -08:00
samcake
3ee6f9d6f2 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-25 23:48:53 -08:00
Andrew Meadows
f964df6c97 final names for ViewFrustum intersection tests 2016-02-25 18:09:35 -08:00
Andrew Meadows
706cf66240 restor name: viewTest() --> frustumTest() 2016-02-25 18:09:35 -08:00
Andrew Meadows
dfdf375853 use shapeInFrustum() names again 
but at the same time make the code more redable
also: add some more efficient shape-touches-view methods
and cleanup some whitespace
 2016-02-25 18:09:35 -08:00
Andrew Meadows
9c927ea36b ViewFrustum method renames and whitespace cleanup 
fooInFrustum() --> computeFooViewLocation()
except pointInFrustum() --> computeFrustumLocation()
 2016-02-25 09:11:28 -08:00
samcake
ae6e625894 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-24 17:30:40 -08:00
samcake
a0d7ce145e Adding support for emissive and occlusion maps, on to pr land 2016-02-24 17:30:29 -08:00
samcake
2f5800a4cc IMproving the shading model and the loading, added the roughness, needt to clean up 2016-02-23 18:31:38 -08:00
Chris Collins
94d018be3e Merge pull request #7172 from zzmp/fix/stats 
Consolidate stats for opaque/transparent/other
 2016-02-23 16:23:11 -08:00
Zach Pomerantz
eb53f44a06 Convert size_t details to int 2016-02-23 12:44:38 -08:00
Zach Pomerantz
7804ee22d4 Consolidate stats for opaque/transparent/other 2016-02-23 12:14:00 -08:00
samcake
1c53f9bc87 Fix the cleanup of the render::Item::ID in the EntityITem Rendereable wich were often not invalidated after beeing removed from the scene. THis caused a bug with particule system when beeing added /removed / updated quickly 2016-02-23 10:40:50 -08:00
samcake
b88501784c Making progress toward the PBR material 2016-02-17 18:47:52 -08:00
Andrew Meadows
fd8073f6b5 init drawstatus to false 2016-02-16 12:11:19 -08:00
samcake
0ad7bacf02 Changing diffuse to albedo and breaking everything... 2016-02-15 21:50:10 -08:00
Zach Pomerantz
5d1aedf707 Update scene items on overlay3d edits 2016-02-15 13:05:19 -08:00
Zach Pomerantz
01309ffd5f Add resort for scene item keys 2016-02-15 13:02:29 -08:00
samcake
0c0089f736 REnamed Octree.h/cpp to SpatialTree and fixing some coding guidelines 2016-02-15 11:08:12 -08:00
samcake
21c9b74a68 Cleaning up performance timers which are taking too much time... 2016-02-12 17:07:53 -08:00
samcake
bcd7876f6c adding better performance stats 2016-02-12 16:53:24 -08:00
samcake
e3307d91ad Fix the debugging tool to be able to freeze the frustum for scene fetch and culling 2016-02-12 14:59:43 -08:00
samcake
9bfeb4a1d5 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-12 11:31:47 -08:00
samcake
40c283cba2 Fixing some warnings 2016-02-12 10:21:28 -08:00
samcake
171acb883f Fixing compilation issue on mac and linux 2016-02-12 09:59:33 -08:00
samcake
b94c2c9b7f Introducing a cleaner filtering pipeline, normally it s good to go 2016-02-11 18:40:36 -08:00
Zach Pomerantz
232f06e175 Avoid unnecessary TaskConfig dtor 2016-02-11 17:29:18 -08:00
samcake
898cfbc043 cleaning a if into an assert 2016-02-11 14:41:37 -08:00
samcake
dedfee3acc Fixing a terrible bug! 2016-02-11 13:43:43 -08:00
Zach Pomerantz
d0f3ad75b8 Nest Persistent in Config to compile on nix 2016-02-11 10:27:32 -08:00
Zach Pomerantz
a7778daed2 Change graphics dialog to persisted dropdowns 2016-02-11 10:15:13 -08:00
samcake
31230e81bb Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-11 10:05:58 -08:00
samcake
355b8ee40d THursday morning the frustum culling seems broken in one particular angle 2016-02-11 10:05:39 -08:00
Zach Pomerantz
84197e5eb2 Add persistent render engine configuration file 2016-02-11 10:00:44 -08:00
Zach Pomerantz
991d6328ef Fix JSON integration for JobConfig 2016-02-11 08:47:58 -08:00
Zach Pomerantz
5f395654f0 Integrate JobConfig with JSON/qml 2016-02-11 08:47:51 -08:00
samcake
b295a3732e Fix a bunch of warnings 2016-02-10 12:18:46 -08:00
samcake
8a4e2cb0c5 cleaning the warnings coming from the os side 2016-02-09 16:27:40 -08:00
samcake
c96dd7f131 Cleaning up of the octree as items are removed 2016-02-09 15:51:38 -08:00
samcake
b1b08bf2f7 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-09 09:24:55 -08:00
Chris Collins
e61636e8a7 Merge pull request #7028 from zzmp/fix/overlay 
Add transparency and layering for overlays
sam is doing it
 2016-02-09 09:18:32 -08:00
samcake
40e49b2376 Starting to remove empty bricks and empty cells 2016-02-08 18:23:29 -08:00
Zach Pomerantz
63d87550b1 Guard batchSetter invocation for ShapePipelines 2016-02-08 17:06:43 -08:00
Zach Pomerantz
281ba3c3ea Fix ShapeKey::withoutCullFace to set, not reset 2016-02-08 16:14:03 -08:00
Zach Pomerantz
a7bafed61b Change ShapeKey::CULL to NO_CULL_FACE 2016-02-08 13:44:42 -08:00
samcake
76d8135fdc Trying to introduce the Filtering step after the full scene culling 2016-02-05 18:21:21 -08:00
samcake
91a28c597a Quiet warnings 2016-02-05 17:18:14 -08:00
samcake
e5f3805d0e Fixing the item insert in cell criteria for subcell and adding debgging tool 2016-02-05 16:49:43 -08:00
Zach Pomerantz
c334e4ebcb Add JSON interface to render::Job::Config 2016-02-05 13:03:47 -08:00
samcake
a999e046b5 Showing the LOD angle 2016-02-04 17:59:35 -08:00
Zach Pomerantz
f0797d8ea0 Move instanced pipeline setup to lambda from batch 2016-02-04 15:32:28 -08:00
samcake
513561ba2d Using an angle for the LOD test 2016-02-04 09:31:21 -08:00
Zach Pomerantz
666213b7a8 Add CULL, DEPTH_BIAS to ShapeKey 2016-02-03 19:18:56 -08:00
Zach Pomerantz
127f9694f6 Fix ordering of batchSetter in pickPipeline 2016-02-03 19:18:56 -08:00
Zach Pomerantz
d14ce8a9fe Pass an explicit pipeline to render.*Instance calls 2016-02-03 19:18:56 -08:00
samcake
78b21c3f4d Refining the culling test and defining the 2 new jobs FetchSPatialTree and CullSpatialSelection 2016-02-03 18:39:40 -08:00
samcake
0478450205 Refining the culling test and defining the 2 new jobs FetchSPatialTree and CullSpatialSelection 2016-02-03 18:38:57 -08:00
samcake
edbcef20d4 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-03 09:44:05 -08:00
samcake
cb59cccc0c Adding 2 lists per brick now, the subcelItems and the regular items, trying to use it, probably buggy 2016-02-02 18:10:56 -08:00
samcake
a29831bdf4 Fancy selection of the brick and cells 2016-02-01 18:16:23 -08:00
Zach Pomerantz
0b6cfbe50a Only connect render config if dirty signal present 2016-02-01 17:48:31 -08:00
samcake
ee7ca35c0c Adding the selectBranch 2016-02-01 16:48:23 -08:00
samcake
6d4744ed47 Trying to see what s going on 2016-02-01 15:17:32 -08:00
samcake
668378481b Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-01 13:48:20 -08:00
samcake
18d8a2fb42 Implementing the octree selection from frustum 2016-02-01 13:47:38 -08:00
samcake
f551ea9f76 fixing compilation on mac and a glsl error on mac 2016-01-31 17:19:47 -08:00
samcake
59434e1ea9 DDisplay of the octree cells is working, added the Brick empty / full per cell 2016-01-29 18:16:45 -08:00
samcake
7b50a4d05f clening up the BRick insert item interface and the shaders 2016-01-29 14:30:53 -08:00
samcake
71e6c6e443 Starting to add the Items on the Octree 2016-01-28 17:57:21 -08:00
samcake
972d4cda77 Adding better octree visualization 2016-01-28 15:31:24 -08:00
Zach Pomerantz
5cbb5000d2 Render the correct maxDrawnItems 2016-01-28 11:42:54 -08:00
samcake
a2a9227d28 Merging with master 2016-01-28 11:37:24 -08:00
samcake
0c50903030 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-01-28 11:19:37 -08:00
samcake
54b9c1ac0d Merge pull request #6962 from zzmp/feat/task-io 
Reduce code duplication for render::Job::Model
 2016-01-28 09:31:26 -08:00
samcake
23f2c98834 fixing the addressing issue 2016-01-28 09:23:45 -08:00
samcake
6d8c33b996 Merging with upstream and still debugging the cell navigation math 2016-01-27 18:59:45 -08:00
samcake
20e1270e92 Merging with upstream and still debugging the cell navigation math 2016-01-27 18:59:18 -08:00
samcake
ce5c115787 Debugging some of the computations in the OCtree::Location 2016-01-27 14:26:17 -08:00
samcake
b53f6b2e03 late night octree traversal 2016-01-27 10:03:31 -08:00
Zach Pomerantz
e770d7b679 Add PhysicsShowOwned back to Menu 2016-01-26 18:56:52 -08:00
samcake
1b1ffa494b Making the octree more useful and cleaning up the interaction with the Scene 2016-01-26 18:46:57 -08:00
Zach Pomerantz
61f337b490 Hold Varying constant over task ctor 2016-01-26 17:43:41 -08:00
Zach Pomerantz
5d157b059f Collapse all Job/Task Models to one, including TaskIO 2016-01-26 17:40:32 -08:00
Zach Pomerantz
5009e8702e Cleanup new render settings 2016-01-26 15:58:50 -08:00
Zach Pomerantz
5b1834d7be Fix Wreorder for Job::Models 2016-01-26 12:44:37 -08:00
samcake
903c7dde5a Drafting the octree, allocating the first cells 2016-01-26 01:59:00 -08:00
samcake
a847a16788 Drafting the Octree and a debugging job 2016-01-25 18:15:07 -08:00
samcake
b96bbab22f Drafting the Octree and a debugging job 2016-01-25 18:14:05 -08:00
Zach Pomerantz
59ac93485e Propogate configuration changes through tasks 2016-01-25 15:18:13 -08:00
Zach Pomerantz
46c937325e Make Job MEMBER enabled explicit 2016-01-25 15:18:11 -08:00
Zach Pomerantz
14d907206e Clean out job enable logic from Job 2016-01-25 15:17:44 -08:00
Zach Pomerantz
bed325d675 Add Graphics to general settings 2016-01-25 15:17:43 -08:00
Zach Pomerantz
b42ab2179e Call QConfig QConfigPointer 2016-01-25 15:17:39 -08:00
Zach Pomerantz
e4af8d89f1 Only refresh engine settings on own thread 2016-01-25 12:14:58 -08:00
Zach Pomerantz
56cc4dc223 Add Job::Config to RenderShadowTask 2016-01-25 12:14:58 -08:00
Zach Pomerantz
f3265db298 Gut RenderContext 2016-01-25 12:14:58 -08:00
Zach Pomerantz
e8b8f4d535 Add Job::Config to HitEffect 2016-01-25 12:14:58 -08:00
Zach Pomerantz
772aedde91 Add Job::Config to AmbientOcclusion 2016-01-25 12:14:58 -08:00
Zach Pomerantz
ccbec54f2d Add Job::Config to DebugDeferredBuffer 2016-01-25 12:14:58 -08:00
Zach Pomerantz
f5a408d82a Notes for later 2016-01-25 12:14:58 -08:00
Zach Pomerantz
f1b7807db7 Add Job::Config to Draw 2016-01-25 12:14:58 -08:00
Zach Pomerantz
adc9d2ea07 Add Job::Config to FetchItems 2016-01-25 12:13:55 -08:00
Zach Pomerantz
c903fc4739 Pass JobConfig to jobs 2016-01-25 12:13:55 -08:00
Zach Pomerantz
5698be5435 It works 2016-01-25 12:13:55 -08:00
Zach Pomerantz
75cddec647 Add alwaysEnabled render::Job::Config 2016-01-25 12:13:55 -08:00
Zach Pomerantz
b70108bb9a Working demo 2016-01-25 12:13:55 -08:00
Zach Pomerantz
0188a9384a Add enabled to Job::Config 2016-01-25 12:13:55 -08:00
Zach Pomerantz
fa2782e113 Add Task implementation 2016-01-25 12:13:55 -08:00
Zach Pomerantz
2e1fbf66ad Refine Configuration for render::Job 
wip

wip

wip

wip
 2016-01-25 12:13:55 -08:00
Zach Pomerantz
581003ec83 Use QObject-derived Configuration for render::Job 2016-01-25 12:13:55 -08:00
Zach Pomerantz
8b68d5922c Make Engine a Task 2016-01-25 12:13:55 -08:00
Zach Pomerantz
3dab1571a5 Make Task a Job 2016-01-25 12:13:55 -08:00
samcake
3ebcb705ab defining the octree 2016-01-25 09:44:01 -08:00
samcake
6fdf1e6cf0 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-01-22 18:30:48 -08:00
Zach Pomerantz
dee8e0ba9d Merge branch 'master' of github.com:highfidelity/hifi into flag/shadows 2016-01-22 10:03:06 -08:00
samcake
b415558f30 FIrst draft of an octree for rendering 2016-01-22 03:23:43 -08:00
samcake
8eddd52731 Fixing coding guidelines 2016-01-21 16:54:37 -08:00
samcake
402809fe2f FIxing coding standards 2016-01-21 16:44:35 -08:00
samcake
8d1ab01018 exposing one more parameter 2016-01-20 18:32:44 -08:00
samcake
4e5869b247 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-20 16:30:24 -08:00
Zach Pomerantz
0c798c06a9 Merge branch 'master' of github.com:highfidelity/hifi into flag/shadows 2016-01-20 14:51:42 -08:00
Zach Pomerantz
0a34ee9138 Externalize list sizing for render::cullItems 2016-01-20 12:39:27 -08:00
samcake
dc40337dc1 Adjusting default settings 2016-01-19 18:02:47 -08:00
samcake
6f93fb3114 Can now process the AO at lower resolution in orer to gsave performances 2016-01-19 12:12:51 -08:00
Zach Pomerantz
568ae2e7bc Move ShoudRenderFunctor to render::CullFunctor 2016-01-19 11:24:11 -08:00
Zach Pomerantz
ff425f40ae Fix shadow leaking scene items 2016-01-18 18:43:01 -08:00
Zach Pomerantz
1b36d56b7a Add shadowmap as a debug feature 2016-01-18 17:12:42 -08:00
samcake
df496b065c Merging with master 2016-01-18 16:40:34 -08:00
samcake
93c7c182b3 Exposing the gpu RangeTimer counter for the AO effect 2016-01-18 14:10:59 -08:00
samcake
39f1649cdf refining the settings for the blur pass and splitting the uniforms in 2 buffers, one per frame with transform info and one for the parameters which are rarely changing 2016-01-16 22:16:07 -08:00
Zach Pomerantz
7f3e102b5e Rename renderLights to renderItems 2016-01-15 17:55:07 -08:00
Zach Pomerantz
331d32ef78 Add render Jobs for Shape sorting 2016-01-15 17:55:07 -08:00
Zach Pomerantz
4bbf206f64 Clean up DrawTask 2016-01-15 17:55:07 -08:00
samcake
577666da6e Merging upstream master 2016-01-14 15:10:54 -08:00
Zach Pomerantz
c704a8d8c5 Add RenderShadowTask 2016-01-14 13:53:11 -08:00
Zach Pomerantz
82f7ea515d Clean up task construction 2016-01-14 12:49:42 -08:00
samcake
0285d48de3 Exposing many more controls of the AO in order to adjust the effect 2016-01-13 18:57:47 -08:00
Zach Pomerantz
5c9c34377e Move GL context sync to render Engine (from Task) 2016-01-13 17:53:15 -08:00
Zach Pomerantz
ee69d8f817 Fix bitsetters for ShapeKey::Builder 2016-01-13 17:44:01 -08:00
Atlante45
12f9091dc1 Fix doInBatch lambdas 2016-01-13 11:47:43 -08:00
samcake
89d2d102f6 exposing the ditheringEnable field 2016-01-12 18:51:30 -08:00
samcake
31bea5034c Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-12 10:02:15 -08:00
Zach Pomerantz
c9e1d8f5f4 Set up pipelinelib correctly (use filters insig bits) 2016-01-11 20:17:52 -08:00
Zach Pomerantz
db91b12203 Refine addPipeline signature to be more explicit 2016-01-11 17:31:19 -08:00
Zach Pomerantz
801dde7950 Merge branch 'master' of github.com:highfidelity/hifi into feat/render-shape 2016-01-11 16:38:04 -08:00
Zach Pomerantz
4ff2b85e1a Replace ShapePipelineLib abstract with ShapePlumber instanced class 2016-01-11 16:00:08 -08:00
samcake
38e9d2281d Merging with master 2016-01-11 15:49:16 -08:00
Zach Pomerantz
407c1bc626 Handle out-of-range in render::FetchItems 2016-01-08 20:16:08 -08:00
Zach Pomerantz
bf68f2f2fa Templatize item culling 2016-01-08 20:11:52 -08:00
Zach Pomerantz
695c69fd34 Conform to coding standards 2016-01-07 14:26:59 -08:00
Zach Pomerantz
c19b457401 Forward arguments and mark T::JobModel as dependent name 2016-01-07 14:15:01 -08:00
Zach Pomerantz
e809c4f89d Avoid copying Item before rendering 2016-01-07 13:42:56 -08:00
Zach Pomerantz
1b3e144395 Rename Shape to ShapePipelineLib, Shape.h to ShapePipeline.h 2016-01-07 13:29:35 -08:00
Zach Pomerantz
39269f12ec Clean and fix Wreorder 2016-01-07 11:40:01 -08:00
Zach Pomerantz
0f6d9a4db6 Use variadic for addJob for cleaner construction 2016-01-07 11:40:00 -08:00
Zach Pomerantz
f902c4078d Clean old DrawSceneTask 2016-01-06 18:55:14 -08:00
Zach Pomerantz
9b4a395f6b Promote render::Job to render::Task::Job 2016-01-06 18:55:13 -08:00
Zach Pomerantz
bcb01feb94 Merge branch 'render-shape' of http://github.com/Atlante45/hifi into feat/render-shape 2016-01-06 11:46:16 -08:00
Atlante45
b68572fdd0 Cleanup renderShapes render loop 2016-01-06 11:43:17 -08:00
Zach Pomerantz
9bc661adc8 Cleanup for style/dead code 2016-01-06 11:42:58 -08:00
samcake
7e2cf741c0 Clen up, exposingthe level of obscurance 2016-01-06 13:16:16 -04:00
Zach Pomerantz
da50eacaad Resolve Hash const function and include per Jenkins 2016-01-05 18:08:28 -08:00
Zach Pomerantz
948dc26d24 Add debug statement for invalid ShapeKey 2016-01-05 17:20:08 -08:00
Zach Pomerantz
4eff377258 Change Slots->Slot to be congruous with gpu 2016-01-05 17:20:08 -08:00
Zach Pomerantz
258a414404 Add ShapeKey::NO_PIPELINE for shapes without Shape::Pipeline 2016-01-05 17:20:08 -08:00
Zach Pomerantz
df54d1dcc9 Fix render::Shape::Pipeline ownership by storing shared_ptr in map 2016-01-05 17:20:08 -08:00
Zach Pomerantz
ad329a9331 Return nullptr if no pipeline is found 2016-01-05 17:20:08 -08:00
Zach Pomerantz
63444aac72 Back to shapeContext, compiling 2016-01-05 17:20:08 -08:00
Zach Pomerantz
cf35974f02 Move shapeContext to jobContext 2016-01-05 17:20:08 -08:00
Zach Pomerantz
dfcb74c3be Split renderItems to Lights/Shapes 2016-01-05 17:20:08 -08:00
Zach Pomerantz
7913ca7f3b Render using ShapeRender, pickPipeline in renderItems 2016-01-05 17:20:08 -08:00
Zach Pomerantz
c0800abdc5 Add virtual ~Shape 2016-01-05 17:20:08 -08:00
Zach Pomerantz
e96b1fa881 Return copies of local vars in Shape 2016-01-05 17:20:08 -08:00
Zach Pomerantz
74c4930034 Remove DrawBackround task 2016-01-05 17:20:08 -08:00
Zach Pomerantz
1a3a9be605 Use PipelinePointer for rendering Shape 2016-01-05 17:20:08 -08:00
Zach Pomerantz
59a354ea8c Change payload interface to return ShapeKey, not MaterialKey 2016-01-05 17:20:08 -08:00
Zach Pomerantz
16bb861046 Add render::Shape to abstract ModelRender 2016-01-05 17:20:08 -08:00
samcake
52f3c7e2cb Introducing the sl files and the blurring stages 2016-01-02 11:27:50 -04:00
Zach Pomerantz
df78f895a6 Reorder RenderContext initializer to avoid -Wreorder 2015-12-22 14:54:47 -08:00
Zach Pomerantz
d8022aa5b0 Add back deferred debugging and combine context init 2015-12-21 14:32:06 -08:00
Zach Pomerantz
c6a2f5b20d Nest JS props in RenderScriptingInterface 2015-12-21 14:32:06 -08:00
samcake
f24800cf10 Change the default tone curve to jusimple gamma correct and fix the renaming in the renderENgineDebug script 2015-12-18 15:35:01 -08:00
Zach Pomerantz
674bfa4f37 Replace RenderContext substructs with subclasses 2015-12-18 12:04:21 -08:00
Zach Pomerantz
d057239023 Rename RenderContext::ItemsMeta to ItemsConfig 2015-12-18 11:48:40 -08:00
Zach Pomerantz
cdcb2d565d Use new RenderContext accessors for rendering 2015-12-18 10:34:39 -08:00
Zach Pomerantz
919a4b6728 Split global JS Scene into Render 2015-12-18 10:33:41 -08:00
samcake
1b1365fd40 Exposing the tone curve in the js api 2015-12-16 16:32:53 -08:00
samcake
1364329886 FIxing the compil bug by checking security of the call with assert and avoiding the compilation error 2015-12-15 22:07:06 -08:00
samcake
d2ebaef69e Adding a simple manual exposure control to configure the tonemapping and expose it to js. Add a convenient way to access the Job._concept._data with template 2015-12-15 18:18:42 -08:00
samcake
3554f54e17 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-14 17:38:56 -08:00
Atlante45
7472673dae More warning fixes 2015-12-11 17:23:12 -08:00
Atlante45
4bfa279b1b Merge branch 'warnings-win' of github.com:Atlante45/hifi into warnings-win 2015-12-11 17:02:57 -08:00
Atlante45
b7ba3c5f17 More warning fixes 2015-12-11 17:02:03 -08:00
Atlante45
79fdb2e882 Fix warnings on windows 64bit 2015-12-11 16:31:27 -08:00
Atlante45
ce51350b65 Fix warnings on windows 64bit 2015-12-11 15:42:15 -08:00
Atlante45
acb9e2774e Basic implementation of debug zone resizing 2015-12-04 21:01:53 -08:00
samcake
119cc733b5 Merging with master 2015-12-04 17:17:33 -08:00
Atlante45
c27944ae28 Simple normal map debug 2015-12-04 10:44:23 -08:00
Atlante45
3da80f5861 gpu::Shader::create* return shared_ptr 2015-12-03 14:56:07 -08:00
Seth Alves
3b6b56f316 formatting 2015-11-13 14:26:43 -08:00
Seth Alves
a366633f84 cleanups 2015-11-12 11:03:44 -08:00
Seth Alves
83d5c9cf4a arrange status icons in two rows of 4 each 2015-11-11 18:54:07 -08:00
Seth Alves
a16a477134 fix warning 2015-11-11 16:51:55 -08:00
Seth Alves
715a46ee82 show actions in status icons 2015-11-11 16:35:04 -08:00
Seth Alves
66387c4530 use icons to show network and physics status 2015-11-10 17:02:57 -08:00
Seth Alves
d043011a11 Merge branch 'render-debug-fixup' of github.com:sethalves/hifi into rework-visual-physics-debug 2015-11-10 10:16:02 -08:00
Seth Alves
8e466190e0 working toward display icons for debug/status display 2015-11-10 10:15:58 -08:00
Seth Alves
f3d26e163d turn _drawItemStatus into a bitfield, split out bounding boxes and network/physics-sim-ownership. hook Display-Simulation-Ownership menu item to this system 2015-11-07 07:19:27 -08:00
Brad Hefta-Gaub
0b2bf8bda8 remove some dead code 2015-10-19 15:23:45 -07:00
Brad Hefta-Gaub
110adc5c22 fix model LOD behavior 2015-10-19 15:21:25 -07:00
Brad Davis
282cdadf63 Fixing line endings 2015-10-18 22:55:14 -07:00
Brad Davis
6f5f6450df Cleanup CMake files 2015-10-11 00:01:03 -07:00
samcake
dc3c9b48ea MOving forward on the background beeing drawn last 2015-09-29 18:28:20 -07:00
Brad Hefta-Gaub
85b2322acc more work on batch optimzation 2015-09-24 17:11:14 -07:00
Brad Hefta-Gaub
9a0e5b9870 address Sam's concerns 2015-09-23 17:37:48 -07:00
ZappoMan
65a079cb53 fix mac build 2015-09-23 16:48:34 -07:00
Brad Hefta-Gaub
ef25876c9a implement vector caching for gpu::Batch 2015-09-23 14:46:47 -07:00
Raffi Bedikian
59a758b5ec Add AA state to RenderContext and Menu 2015-08-30 20:38:05 -07:00