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 |
|