Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-10 13:58:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
59280 commits 74 branches 59 tags 1.2 GiB
Commit graph

2790 commits

Author SHA1 Message Date
sam
709c2e4240 Fixing the emissive on overlayfor models 2017-02-27 02:52:00 -08:00
sam
a53d5e8fbd adjusted the PLumber shape keys to coever non material shapes in main pass 2017-02-25 13:00:37 -08:00
samcake
9ffdc03dc9 setting the shaeKeys for the overly properly because most of them are CustomPipleline 2017-02-24 18:25:24 -08:00
samcake
1b501487fd simple shader checks 2017-02-24 16:03:28 -08:00
Seth Alves
6e9854cad0 don't crash if geometry fails to load 2017-02-24 13:01:01 -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
6d59144a4f Trying to fix the emissive for overlay in front ? 2017-02-23 17:42:02 -08:00
samcake
c7b164d8f2 Adding differenciation for the Material shapeKey bit 2017-02-22 18:21:18 -08:00
samcake
ad40e2d7d9 Trying to address the ktx serialization problem with normal, still have a bug 2017-02-22 17:16:37 -08:00
samcake
a00216cb4f debugging the emissive issue for verlay in front 2017-02-21 18:20:55 -08:00
samcake
55611d2373 Backing up to master 2017-02-21 14:56:07 -08:00
samcake
5e3c79d197 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-02-21 14:49:52 -08:00
Brad Davis
27e8750b9b Adding new storage backing for gpu::Texture, moving mip format into Storage abstraction 2017-02-19 18:11:56 -08:00
sam
d56f982dec Maybe saving the first ktx textures, testing the save pipeline 2017-02-17 07:54:17 -08:00
Bradley Austin Davis
7fb7aa87eb Working on new texture management strategy 2017-02-17 07:53:16 -08:00
Atlante45
1201932ee9 Fix SSE2 macros for Macos 2017-02-14 14:10:53 -08:00
samcake
9261e81ba2 Cleaning up the interface 2017-02-10 17:47:56 -08:00
samcake
2da1801fbf Fixing the failing shader 2017-02-10 14:40:39 -08:00
samcake
37541e4ed2 Start capping the time budget for draw opaque 2017-02-10 14:29:29 -08:00
samcake
b9102204ea FIx the filtering problem on color and normals introduced since we generate mips with QImage 2017-02-10 11:40:39 -08:00
samcake
c864e57855 first pass on a working image class and the mip generation 2017-02-06 08:51:04 -08:00
samcake
e8cdee71ed avoid assertion on mac 2017-02-03 22:49:41 -08:00
sam
2ecda8b64e Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-02-01 18:03:07 -08:00
Seth Alves
ab8be15ce0 Merge pull request #9570 from highfidelity/tablet-ui 
Tablet ui
 2017-02-01 09:38:13 -08:00
samcake
c88d070868 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-01-31 11:49:25 -08:00
samcake
04d5173328 Merge pull request #9530 from AndrewMeadows/computeBoundsOutsideLambda 
compute Model's local bounds outside pending changes queue
 2017-01-31 11:40:21 -08:00
samcake
0b139c906c Assigniing default textures that make sense 2017-01-31 10:56:30 -08:00
Brad Hefta-Gaub
cff49ea5f3 Merge pull request #9556 from samcake/blue 
Adding support for disabling texturing from the material
 2017-01-31 10:39:44 -08:00
Anthony J. Thibault
0f75668923 Moved Model setting of _spatiallyNestableOverride to constructor 2017-01-31 09:36:21 -08:00
samcake
249ec80d74 Writting a better version of the no texture case 2017-01-30 15:48:48 -08:00
Anthony J. Thibault
0962a15a06 Fix for one-frame lag in the tablet stylus. 2017-01-30 15:39:55 -08:00
samcake
3c56bd2960 Adding support for disabling texturing from the material 2017-01-30 15:03:04 -08:00
Anthony J. Thibault
39d68828ab Disable FXAA on tablet overlay in desktop mode. 
This introduces the "isAA" property to 3d overlays. When false, the overlay is rendered after
the "Antialiasing" render pass.  Ironically, disabling FXAA makes the text more readable, which is
essential in 2D desktop mode.

Two new shaders were introduced.

simple_opaque_web_browser_overlay.slf
simple_transparent_web_browser_overlay.slf

These are tailored to write into the main framebuffer instead of the g-buffer.
 2017-01-30 11:24:59 -08:00
Anthony J. Thibault
a9b478888c First cut of Web3DOverlays without FXAA applied. 2017-01-30 11:24:58 -08:00
Andrew Meadows
489fbc6299 compute Model's local bounds outside render lambda 2017-01-27 09:35:36 -08:00
Seth Alves
db38503d57 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-26 13:48:59 -08:00
Andrew Meadows
09707217ec remove Model::simulateInternal() 2017-01-26 08:35:25 -08:00
Andrew Meadows
08bba5f45f add and remove some profile data points 2017-01-26 08:35:25 -08:00
Seth Alves
be8bc9652b Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-23 09:44:04 -08:00
Andrew Meadows
10cdea9cd8 cleanup model fade logic 2017-01-19 14:17:50 -08:00
Andrew Meadows
b7c1bfaf58 another attempt to fix model transform 2017-01-19 14:01:40 -08:00
Andrew Meadows
d3af420516 fix broken model transforms 2017-01-19 13:07:50 -08:00
Andrew Meadows
1d6f47e3d8 repack to reduce MeshPartPayload footprint 8 bytes 2017-01-19 12:56:08 -08:00
Andrew Meadows
bfbef91f53 re-enable cauterization of meshes for MyAvatar 2017-01-19 12:56:07 -08:00
Andrew Meadows
3dd8fd838b move cauterization out of Model class 2017-01-19 12:56:07 -08:00
Seth Alves
eb25e1c12d Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-19 09:41:49 -08:00
samcake
149e727cf3 Merge pull request #9429 from gcalero/android_forward_shaders 
Create render forward version of pixel shaders
 2017-01-19 00:48:25 -08:00
Gabriel Calero
5602479988 Create render forward version of pixel shaders 2017-01-18 19:18:59 -03:00
Seth Alves
6bace4f451 merge from upstream 2017-01-17 09:29:30 -08:00
samcake
960f4f0ead Move the drawBOunds job to DrawTasks 2017-01-16 18:33:42 -08:00
samcake
0b9b5d595c Merge branch 'master' of https://github.com/highfidelity/hifi into meta 2017-01-16 17:48:16 -08:00
samcake
83d1c3ad01 Adding support for the meta rendering 2017-01-16 17:47:58 -08:00
Andrew Meadows
fd28457807 fix cauterization hack 2017-01-16 15:13:28 -08:00
Chris Collins
2557c797af Merge pull request #9300 from zzmp/graphics/forward-opaque 
Add opaques/skinned to forward rendering path
 2017-01-16 08:48:18 -08:00
Seth Alves
5a81dface9 avoid filling log with bogus warning 2017-01-13 12:00:51 -08:00
Seth Alves
e9422cbf1e fix model scales 2017-01-12 16:38:27 -08:00
Seth Alves
5fa379fea2 fix model scales 2017-01-12 16:12:43 -08:00
Seth Alves
208c4686c4 merge from upstream 2017-01-12 15:44:27 -08:00
samcake
ca53235d54 Merge pull request #9358 from AndrewMeadows/model-cleanup 
minor cleanup for Model rendering code
 2017-01-12 14:30:16 -08:00
Anthony J. Thibault
26a5b5ed91 Fix for rendering of tablet ModelEntity in desktop mode. 
The Model pendingChanges.updateItem() lambda now directly calls into StaticallyNestable.  This is late enough
in the update loop to have the most up-to-date camera transform used for rendering.
 2017-01-11 18:37:57 -08:00
Andrew Meadows
c060fd6a68 restore updateClusterMatrices() in render() 2017-01-11 17:33:30 -08:00
Andrew Meadows
e2130d33d9 speedup cauterizedClusterMatrices math 2017-01-11 15:10:44 -08:00
Andrew Meadows
b3e336de3d remove cruft: unused function arguments 2017-01-11 15:02:18 -08:00
Andrew Meadows
87bdaae05a remove scale from ModelMeshPartPayload's transform 2017-01-11 12:38:47 -08:00
Andrew Meadows
bd16824d55 remove cruft: Model::_pupilDilation 2017-01-11 06:57:05 -08:00
Andrew Meadows
1804f33b98 add assert and TODO comment 2017-01-11 06:56:35 -08:00
Andrew Meadows
5d880487a0 cleanup class method declarations 2017-01-11 06:56:07 -08:00
Andrew Meadows
e88f02d7b6 remove cruft 2017-01-11 06:55:13 -08:00
sam
7a01b856f7 Factorization of the modelTransform out of the cluster matrices 2017-01-11 02:33:56 -08:00
Andrew Meadows
44699fc661 modelToWorld rotation not in cluster matrices 2017-01-10 16:21:13 -08:00
Brad Davis
1dd2747ef9 Push some tracing into 'detail' categories for easy filtering. Add new tracing categories, add counter change tracking. 2017-01-10 10:44:04 -08:00
Chris Collins
30d5f70e11 Merge pull request #9278 from jherico/cpu_opt_scene 
More low level optimizations
 2017-01-09 10:10:40 -08:00
Zach Pomerantz
1b948c7a05 add skinned forward model shaders 2017-01-04 15:49:29 -05:00
Zach Pomerantz
6b984d38d3 add opaque forward model shaders 2017-01-04 15:37:17 -05:00
Zach Pomerantz
f7cb2ec85b add plain forward model shaders 2017-01-03 20:41:57 -05:00
Zach Pomerantz
a414ba4cb5 take addPipeline lambda out of initDeferredPipelines 2017-01-03 18:55:13 -05:00
Zach Pomerantz
62eeb0c807 clean RenderPipelines with forward decls 2017-01-03 18:33:14 -05:00
Zach Pomerantz
89917b41fd add Forward Draw for opaques (no pipelines) 2017-01-03 15:18:22 -05:00
Zach Pomerantz
f8e8065e93 mv DrawBounds to end of ForwardTask 2017-01-03 14:56:47 -05:00
Zach Pomerantz
2e274b026d fix line lengths 2017-01-03 14:55:47 -05: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
Zach Pomerantz
c75dd236f2 rm unused forward pipelines 2016-12-29 19:11:06 -05:00
Zach Pomerantz
d00ae05e26 add background to forward renderer 2016-12-29 19:09:06 -05:00
Brad Davis
99af7f2819 Reduce unecessary copying in MeshPartPayload::bindMaterial 2016-12-28 12:11:27 -08:00
Brad Davis
e5e9ab42ea Encapsulate AnimPose members for easier optimizations 2016-12-28 12:11:24 -08: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
8d63067fa5 templatize graphics engine tasks' run method 2016-12-23 14:58:40 -05:00
Zach Pomerantz
dbf4f2d23b mv shadow task setup to jobs 2016-12-23 14:58:40 -05:00
Andrew Meadows
0b0c3f0be4 cleanup some if-logic 2016-12-21 10:55:59 -08:00
Brad Hefta-Gaub
c65471e880 Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam 
Conflicts:
	libraries/script-engine/src/FileScriptingInterface.cpp
 2016-12-19 22:27:24 -08:00
Brad Hefta-Gaub
dbbed462b4 cleanup naked qDebug() calls 2016-12-19 22:24:25 -08:00
samcake
c435afb728 Introducing a fix for the overlayered model drawn in front 2016-12-19 13:17:56 -08:00
Brad Davis
ee3c8e6efd Merge pull request #9225 from jherico/chrome_tracing 
Additional work on tracing
 2016-12-16 17:53:55 -08:00
Ryan Huffman
1d9a32c528 Add FIXME comment to texture setting in Model.cpp 2016-12-16 16:32:53 -08:00
Ryan Huffman
18a166bee8 Fix models not settings textures if not loaded 2016-12-16 15:05:17 -08:00
samcake
1ded581895 Merge pull request #9217 from zzmp/feat/render-forward-bounds 
Render bounds in Forward Render Task
 2016-12-16 14:57:14 -08:00
Brad Davis
30a9961362 tracing polish 2016-12-16 14:02:27 -08:00
Andrew Meadows
ee6a9f4506 adding profile stats relating to avatar CPU costs 2016-12-16 13:41:31 -08:00
Ryan Huffman
7bb2755913 Add chrome tracing support 2016-12-16 01:14:01 -08:00
Zach Pomerantz
013713f92c rm unused scene 2016-12-15 15:21:57 -05:00
Zach Pomerantz
9e05403aba forward render opaque bounds 2016-12-15 14:59:25 -05:00
Zach Pomerantz
bae6ceb2ae rm extra buffer clears in forward render 2016-12-15 14:57:22 -05:00
Brad Hefta-Gaub
25c6e8021f Merge pull request #9198 from zzmp/chmod/render-utils 
Change file permissions of source code to remove execute bits
 2016-12-15 10:37:36 -08:00
samcake
7a29dbe7d4 Merge pull request #9207 from zzmp/feat/render-forward-empty 
Forward render task (empty and only used with RENDER_FORWARD set)
 2016-12-15 09:57:18 -08:00
Zach Pomerantz
87a8ad1289 strip forward render task to clear and blit 2016-12-13 20:48:05 -05:00
Zach Pomerantz
bc59be12ef create flagged forward render task 2016-12-13 19:19:30 -05:00
samcake
0b221abfb2 writting the abs differently 2016-12-13 15:27:50 -08:00
samcake
f509d1fca4 Clening up the fix 2016-12-13 12:48:16 -08:00
Zach Pomerantz
9a37ccbf3c chmod -x to render-utils src 2016-12-13 14:36:41 -05:00
samcake
d4f4bd4519 Debugginfg the bad tiles lighting 2016-12-12 18:02:14 -08:00
sam
2427a16d6e clean up and less changes 2016-12-09 03:05:25 -08:00
sam
914fc7fca8 rewind all the unecessary changes and do just the minimum layout(std140) and accessing the big arrays in vec4s to fix the amd bug 2016-12-09 02:58:09 -08:00
sam
7a97570949 Debugging the amd shader???? 2016-12-09 02:12:31 -08:00
samcake
d851278acd FIx the highlight issue, the gloss 2 is actually roughnees to the power of 4 2016-12-08 15:04:57 -08:00
Bradley Austin Davis
2ca4d0ab29 Fix drop in text rendering quality on texture memory constrained systems 2016-12-05 14:12:57 -08:00
sam
310e26011f Fix the lighting problem at the outline of the shapes, use the depth buffer instead of the Linear depth buffer 2016-12-05 00:47:50 -08:00
samcake
d764eebc79 removing dead code 2016-11-22 12:10:56 -08:00
samcake
dfc0b7beac adressed reveiw comments 2016-11-22 10:15:49 -08:00
samcake
31232a1078 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-11-21 11:30:26 -08:00
Brad Davis
3074be7ad0 Glow line replacement without geometry shader 2016-11-18 17:42:55 -08:00
samcake
7c003ce865 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-11-16 19:13:22 -08:00
samcake
9031e65aa5 Merge and fix the bug!!! 2016-11-16 19:12:56 -08:00
Brad Davis
fa841620ab Disable glow line temporarily while fixing implementation 2016-11-16 12:50:47 -08:00
samcake
982664dac5 Merging with upstream 2016-11-15 18:14:25 -08:00
Brad Hefta-Gaub
86430e4121 Merge pull request #8960 from samcake/red-backup-many-stereo-paths 
Introduce Instanced Stereo Drawcall
 2016-11-14 18:30:42 -08:00
samcake
a05e42138c Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-11-14 09:58:12 -08:00
samcake
1d3fc1b647 Fix a bad conversion to integer for negative values of the GRid COordinates 2016-11-10 17:57:11 -08:00
Anthony J. Thibault
620fd3713c Add color support to debug draw marker rendering 2016-11-04 17:09:25 -07:00
samcake
6926cd274c Merge with upstream 2016-11-02 18:15:08 -07:00
samcake
d5f44befc6 Merge branch 'master' of https://github.com/highfidelity/hifi into red-backup-many-stereo-paths 2016-10-31 17:41:07 -07:00
samcake
37b3c96131 fixing the lighting problem in stereo 2016-10-31 17:40:34 -07:00
samcake
9adbb42a6c Fixing the skybox, still issues with the lights 2016-10-28 18:12:39 -07:00
Zach Pomerantz
be23668ca8 delete websurfaces on shutdown 2016-10-28 14:29:52 -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
Brad Davis
2705ee7030 Remove the use of implicit ids in geometry cache 2016-10-19 11:18:25 -07:00
Brad Davis
dde79ef3c5 Fix GPU buffer leak in geometry cache / overlays 2016-10-17 12:22:20 -07:00
Brad Hefta-Gaub
0e1b377227 Merge pull request #8785 from jherico/oculus_crash 
Additional plugin debugging, better plugin resource cleanup
 2016-10-13 13:54:34 -07:00
samcake
7956c7b10b Fixing a mistake introduced in previous commit in a shader 2016-10-12 09:57:06 -07:00
samcake
5f9c713d44 Merging with upstream after resolving some conflicts 2016-10-12 09:22:12 -07:00
Brad Davis
4e0fffb8b7 Merge pull request #8779 from gcalero/shaders_gl_es 
Adapt shader for GL ES support
 2016-10-12 08:32:50 -07:00
Brad Davis
28771cbda9 Additional plugin debugging, better plugin resource cleanup 2016-10-11 19:40:02 -07:00
samcake
77062ac1b3 Cleaning up a missing constructor and adjusting the stride for the StrucBuffer by default + merging with upstream 2016-10-11 17:13:08 -07:00
samcake
eea5118eab Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-10-11 16:19:00 -07:00
samcake
7ea790aa4f adding a comment to explain what we are doing 2016-10-11 14:43:41 -07:00
samcake
7af3aa53ac Fixing the key light pass with ambient map 2016-10-11 13:20:32 -07:00
Gabriel Calero
834d9c0710 Adapt shader for GL ES support which requires operators of the same datatype 2016-10-11 12:15:49 -03:00
samcake
297907688c Fixing reveiw comments 2016-10-10 12:43:33 -07:00
samcake
8476939ba9 Avoiding warnings maybe 2016-10-07 16:44:51 -07:00
samcake
429a7cf58a adjust grid dimension to 14 x 14 x 14 conservatively to keep the generation fast 2016-10-07 16:12:36 -07:00
samcake
8a44140e6b cleaning up the comments from review and trying something to adress the issue that showed up on i5 2016-10-07 16:04:19 -07:00
sam
567adf651a FOund 2 bugs causing the empty clusters. now back to working 2016-10-07 05:02:04 -07:00
samcake
ac54533433 Adding more counters to understand the cullign bug 2016-10-06 18:15:32 -07:00
samcake
4504877ba6 Add a finer culling test to avoid faulty discards 2016-10-06 15:14:08 -07:00
samcake
6f7f949343 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-10-06 09:35:48 -07:00
samcake
765355e5d1 Avoid the debug view by default 2016-10-05 18:30:03 -07:00
samcake
ba88db1b14 Tried many different things to narrow down the issue of the corrupted memory, it seems to be linked to the grid dimendsions somehow, i m now forcing to reassign the frustum grid dimension on the 10th iteration which seems to fix the issue.... 2016-10-05 18:28:19 -07:00
Clément Brisset
3f64847888 Merge pull request #8726 from huffman/feat/model-overlay-hide-change-textures 
Fix model overlay visibility and texture properties
 2016-10-05 11:54:11 -07:00
samcake
8c561eaa44 trying to whipe these buffer cleans but doesn;t seems to make a different in release, it is working clena in debug ... keep on looking 2016-10-04 18:19:42 -07:00
Ryan Huffman
c683c82817 Fix setting textures in model overlays 2016-10-04 16:24:43 -07:00
samcake
3e11eb4129 Try avoiding the basd update of the buffer for the grid content 2016-10-04 13:55:53 -07:00
samcake
1c2a672214 Adjust the grid size for mac 2016-10-04 13:29:08 -07:00
samcake
6aa39ec95a Polish the debugging of the light volumes 2016-10-04 11:03:12 -07:00
samcake
a378a6eccb separate the rendering of the light outline from the main rendering and introduce a way to support both platform 2016-10-03 18:28:44 -07:00
samcake
c72b330821 Simple change to the get cluster interface 2016-10-03 15:34:54 -07:00
sam
bda835361a Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-10-03 02:54:11 -07:00
sam
deab1db39a FIxed the flickering bug and make a better debuging view to control the overlap 2016-10-03 02:53:41 -07:00
sam
6f2452815c pass the visibility of the enitity to the LightPaylkoad correctly, clean up the ambient shader 2016-10-03 00:08:30 -07:00
Brad Davis
488d191428 Remove all oglplus usage and references 2016-10-02 11:44:34 -07:00
sam
9a492b3a88 refining the voxelizatoion, tracking one bug where light flickers 2016-10-02 03:43:55 -07:00
Brad Hefta-Gaub
7ef8e53d03 Merge pull request #8701 from ZappoMan/getShapeKeyCrashFix 
add guards to getShapeKey
 2016-10-01 20:23:50 -07:00
sam
bd4268ee18 Try to fix the exp2 float version for linux 2016-10-01 17:59:37 -07:00
samcake
bdf2738f21 One more fix for linux build 2016-10-01 17:25:26 -07:00
samcake
89717720f7 CLeaning up code for Linux and Mac 2016-10-01 16:12:45 -07:00
Brad Hefta-Gaub
7fe16442fa make calculateTextureInfo thread safe 2016-10-01 15:47:17 -07:00
samcake
35f0d4b8a2 cleaning for mac 2016-10-01 15:35:59 -07:00
Brad Hefta-Gaub
04f6547940 add guards to getShapeKey 2016-10-01 12:15:03 -07:00
samcake
0475833e3b Friday night state, down to ~3.5ms in hmd 2016-09-30 19:08:00 -07:00
samcake
5b4829e7b6 Brining back support for the ambinet lighting 2016-09-30 16:24:57 -07:00
samcake
337fe155b7 clean up warning and merge with upstream 2016-09-30 11:01:25 -07:00
sam
e143c05ef8 Keep on investigating the shading cost per light 2016-09-30 02:41:21 -07:00
samcake
2a0e67ee2a REvisiting the full lighting code to optimize the perf 2016-09-29 19:06:26 -07:00
samcake
b09151f2a2 Rearrange the light struc description in the shader side, needs the c++ to match now 2016-09-28 18:32:35 -07:00
samcake
cd9dff57be back to normal 2016-09-28 10:03:51 -07:00
samcake
a0862820e6 MOre refinements? 2016-09-27 18:38:15 -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
Brad Davis
0953027ef3 Identify pre-generated textures 2016-09-23 12:04:56 -07:00
Brad Davis
1ff91219a8 Fix strange artifacts in skybox 2016-09-23 12:04:52 -07:00
samcake
3616a6fc12 Startign implementing the tighter culling for sphere but not done yet 2016-09-14 19:13:53 -07:00
samcake
f789f566e0 Minor fix for compilation 2016-09-14 17:34:17 -07:00
samcake
e0536a84e2 Minor fix for compilation 2016-09-14 17:18:39 -07:00
samcake
fdba78db6f Better vizualization, first set of culling improvment 2016-09-14 16:36:01 -07:00
samcake
af48d4f0bd fetch the cluster content through a function to be able to change the implementation 2016-09-14 09:28:51 -07:00
samcake
c622849481 Splitting the frustum culling test horizontal and vertical 2016-09-13 17:59:06 -07:00
samcake
11c6bb7d80 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-09-13 17:44:42 -07:00
samcake
124060d31a Cleaning up a bit 2016-09-13 17:44:19 -07:00
samcake
fea5f8b03b best state for now 2016-09-13 16:03:57 -07:00
samcake
e8c2dc10f1 best state for now 2016-09-13 14:59:23 -07:00
samcake
e9bf19840c minor fixes on mac 2016-09-13 08:58:07 -07:00
samcake
efc4406b47 Debugging the grid content 2016-09-12 19:46:18 -07:00
David Rowe
0cf3f6e953 Fix texture count and size getting stuck on 0 2016-09-13 13:03:06 +12:00
David Rowe
fe8b3b4d0d Merge branch 'master' into 21040 2016-09-13 09:12:47 +12:00
samcake
821072bb76 REarrange the light stage construction and light frame usage to produce the light clusters 2016-09-12 11:07:55 -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
108910052a Adding the reverse transformation 2016-09-09 19:00:54 -07:00
David Rowe
68499f49ad Fix count of textures 2016-09-10 10:15:13 +12:00
samcake
9bcaca0577 Developping the Light Clusters, adding visualization 2016-09-08 19:12:11 -07:00
samcake
61de063b29 Developping the Light Clusters, adding visualization 2016-09-08 18:02:35 -07:00
sam
25616be7c1 introducing the light Clusters 2016-09-08 02:16:13 -07:00
sam
a4df8a84b7 introducing the light Clusters 2016-09-08 00:11:54 -07:00
samcake
6a08c74463 Several experimetations without success 2016-09-07 18:39:07 -07:00
samcake
139ba1b71c REnaming the shaders correctly 2016-09-07 14:56:01 -07:00
samcake
34f40e0828 Creating a separate shader for the locallighting pass 2016-09-06 19:01:13 -07:00
samcake
665a79f100 Creating a separate shader for the locallighting pass 2016-09-06 18:59:26 -07:00
samcake
9bed047b75 Less warnings 2016-09-06 16:42:01 -07:00
samcake
e2a9751cf5 REmove warnings 2016-09-06 16:35:28 -07:00
samcake
1165c54f67 cleaning up the IndexedContainer in its own file and removing warnings 2016-09-06 16:24:03 -07:00
samcake
0c45627d94 CLeaning up the code for the RenderableLightEntityItem 2016-09-06 12:39:48 -07:00
sam
b81dfefbeb pack all the lights in a single buffer and shade the opaque with a single full screen path 2016-09-03 12:08:53 -07:00
samcake
d2a15ca82c Trying to migrate to a light array instead of each individual lights 2016-09-02 17:51:35 -07:00
Anthony J. Thibault
9122a33fff only raise the webEntity virtual keyboard in HMD mode 2016-09-02 16:53:40 -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
7b68f1439f Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-09-02 09:28:35 -07:00
Brad Hefta-Gaub
e3bad8e8f4 Merge pull request #8556 from ZappoMan/renderStats 
add support for renderInfo properties to model entities
 2016-09-02 09:04:56 -07:00
samcake
e72791233d overall clean up of th elocal light drawing to avoid the in/out pipeline case, still seeing big cost on gpu from the spot lights 2016-09-01 18:08:36 -07:00
samcake
0c0109e427 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-09-01 15:20:34 -07:00
samcake
96935504a1 Streamlining the lighting phase for better performances 2016-09-01 15:20:14 -07:00
samcake
a537f40158 Moving to a simpler lighting shader 2016-09-01 12:10:15 -07:00
samcake
354cbbc927 Investigate why the disable depth Bclamp doesn't work 2016-08-31 19:14:35 -07:00
Stephen Birarda
65c1edfb1c add missing link from render-utils to entities 2016-08-31 16:57:52 -07:00
Brad Hefta-Gaub
e1845e2c3f add support for renderInfo properties to model entities 2016-08-31 15:00:21 -07:00
Stephen Birarda
7c2fea4598 remove glew/oglplus requirement for android interface 2016-08-31 11:03:53 -07:00
samcake
47aaed491d Merging with Blue 2016-08-30 17:06:29 -07:00
samcake
93aec28c7b Less warning 2016-08-30 14:54:58 -07:00
samcake
af68a2550e Remve dead code 2016-08-30 14:53:37 -07:00
samcake
faef8a9930 Adding the timing for GPU support with a simpelr JobConfig 2016-08-30 12:22:21 -07:00
samcake
3755a3fc32 Add batch timing information vs gpu 2016-08-29 17:54:17 -07:00
samcake
4bf93f66df Cleaning up the lights and the light stage 2016-08-26 17:47:20 -07:00
Brad Hefta-Gaub
9801ff075a Merge pull request #8433 from samcake/hdr 
Fix Screen Space ambient occlusion which was broken since a while
 2016-08-25 16:57:24 -07:00
Brad Hefta-Gaub
10c465f591 Merge pull request #8525 from hyperlogic/bug-fix/web-entity-rendering 
Improved web entity rendering
 2016-08-25 16:49:00 -07:00
samcake
8cc65ea965 Adrressing review issues 2016-08-25 16:31:42 -07:00
samcake
09a70740a8 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-08-25 15:21:41 -07:00
samcake
9669234f9c Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-08-25 12:36:01 -07:00
Anthony J. Thibault
e82f6a90af Improved web entity rendering 
* fading now works properly
* web browsers are now fully opaque.
 2016-08-25 11:04:23 -07:00
Andrew Meadows
c337cc92e5 remove crufty comment 2016-08-25 08:51:53 -07:00
Andrew Meadows
b95cb566cd fix collision mesh for non-trivial registration 2016-08-24 22:26:56 -07:00
Andrew Meadows
19cd4648ad scale collision render mesh correctly 2016-08-24 22:26:56 -07:00
Andrew Meadows
2f16aca114 remove cruft and fix typo in rebase 2016-08-24 22:26:56 -07:00
Andrew Meadows
68dd66daec create collision render geometry only when needed 2016-08-24 22:26:56 -07:00
Andrew Meadows
b0a0293e6e move compoundResource out of Model class 2016-08-24 22:26:56 -07:00
Andrew Meadows
fe4198530f don't render raw compound collision geometry 2016-08-24 22:26:56 -07:00
Andrew Meadows
329c5432ed _showCollisionHull --> _showCollisionGeometry 2016-08-24 22:26:56 -07:00
Andrew Meadows
481d6990a3 trigger collision shape render mesh creation 2016-08-24 22:26:56 -07:00
Andrew Meadows
26f5d3cfaa fix render geometry for collision shapes 2016-08-24 22:26:56 -07:00
Andrew Meadows
6b0ae654ba cleanup logic around creating RenderItems 2016-08-24 22:26:56 -07:00
Andrew Meadows
d8fa0d1dd1 segregateMeshGroups() --> createRenderItems() 2016-08-24 22:25:45 -07:00
Andrew Meadows
726928c14c creae collision Geometry from mesh 2016-08-24 22:25:45 -07:00
Brad Davis
c5628b615c Make sure we start fade in once an item becomes ready 2016-08-24 16:05:22 -07:00
samcake
4da712fbdf Fixing bad include not respecting filename case (for linux) 2016-08-22 10:36:43 -07:00
samcake
44c6637160 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-08-22 10:32:06 -07:00
sam
1e84f9dc90 back to noise seeded in image space 2016-08-21 23:37:24 -07:00
sam
4097fcb0f6 fixing the blurring issue 2016-08-21 00:27:43 -07:00
Seth Alves
9bcda1bb45 merge from upstream 2016-08-20 15:25:04 -07:00
samcake
9cdd079213 And again 2016-08-19 18:22:14 -07:00
samcake
6a076bcee4 PRoviding a fix for the macOS build 2016-08-19 11:09:12 -07:00
samcake
a4945fe45c Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-08-19 10:00:40 -07:00
Brad Hefta-Gaub
1cec7b2db0 Merge pull request #8429 from SamGondelman/loadingFade2 
Don't do fade effect once physics kick in
 2016-08-18 12:46:24 -07:00
samcake
b5296410c3 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-08-18 10:20:33 -07:00
Seth Alves
87dbfa7e47 add -Wsuggest-override to compile flags and deal with fallout 2016-08-18 09:51:41 -07:00
samcake
8d12a23efb Merge pull request #8325 from jherico/deferred_batches_threaded 
Threaded rendering
 2016-08-15 09:59:44 -07:00
Brad Davis
fdbbd70eed Merge pull request #8422 from sethalves/sidestep-linux-gcc-bug 
sidestep linux gcc linker? bug
 2016-08-13 12:08:05 -07:00
Brad Davis
574737fbb5 More GPU api fixes, protect Buffer::flush 2016-08-12 22:29:04 -07:00
Brad Davis
6d7edd38cc Rename clearViewTransform 2016-08-12 22:28:59 -07:00
Brad Davis
cbe1f6dbf5 Allow the lighting framebuffer to use the camera correction to stabilize lights in the HMD 2016-08-12 22:28:32 -07:00
Brad Davis
894d29bb29 Fixing flicking in instance based objects 2016-08-12 22:28:24 -07:00
Brad Davis
adcfd55cc0 Batch replay reprojection 2016-08-12 22:28:23 -07:00
samcake
b90e0cfd89 Fixing the stereo issue 2016-08-12 19:18:05 -07:00
SamGondelman
ccca6d935f don't fade after physics kick in 2016-08-12 14:35:22 -07:00
samcake
4fe67bfbf1 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-08-12 10:56:59 -07:00
Seth Alves
77a49e6c10 when building in debug mode on Linux, for reasons totally beyond me, this code ends up using the Vertex from FBXReader_Mesh.cpp (which is a different size so I get a crash). This change hopefully doesn't change any functionality while sidestepping what's probably a bug in gcc. 2016-08-12 10:01:20 -07:00
Brad Hefta-Gaub
a714f325fe Merge pull request #8333 from SamGondelman/miscFixes 
Miscellaneous cmake and render engine improvements
 2016-08-10 11:06:50 -07:00
SamGondelman
9e20d92241 CR changes 2016-08-10 10:35:18 -07:00
SamGondelman
9b27f8bc0f Merge remote-tracking branch 'upstream/master' into loadingFade 2016-08-09 14:55:14 -07:00
SamGondelman
36d9f92101 performance optimization to minimize calling usecTimestampNow 2016-08-09 13:10:02 -07:00
SamGondelman
ae9fb3768c CR notes 2016-08-08 17:45:25 -07:00
samcake
4d3dce449f Better maybe 2016-08-08 17:28:04 -07:00
Ryan Huffman
6854f9fda4 Remove stars shaders and renderable 2016-08-08 16:03:03 -07:00
SamGondelman
de900e85c0 remove duplicate include 2016-08-08 14:10:47 -07:00
SamGondelman
328d3128fa merge from master 2016-08-08 13:30:39 -07:00
SamGondelman
f311907982 fix merge mistake 2016-08-08 11:08:01 -07:00
Ryan Huffman
2a071c4329 Fix improperly formatted floats 2016-08-08 10:39:06 -07:00
Ryan Huffman
4f9be2ae72 Fix camera position not being set for angular loading 2016-08-08 08:53:06 -07:00
Ryan Huffman
77e993510e Cleanup implementation of angular loading 2016-08-08 08:53:05 -07:00
Ryan Huffman
c594dcdf9f Add priority loading for model entities 2016-08-08 08:52:29 -07:00
sam
db8bf78dd1 Good state 2016-08-08 02:28:25 -07:00
sam
e6c74b29c7 WTF... 2016-08-07 19:48:23 -07:00
sam
b133556c14 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-08-07 18:55:44 -07:00
sam
d1105b8102 Still trying 2016-08-07 18:10:03 -07:00
sam
e92e69d963 More changes 2016-08-06 11:54:54 -07:00
SamGondelman
dd51e0e38f merge from master 2016-08-05 17:04:45 -07:00
SamGondelman
771e105fa2 Merge remote-tracking branch 'upstream/master' into loadingFade 2016-08-05 16:52:01 -07:00
Sam Gondelman
debda37567 Merge pull request #8379 from SamGondelman/loadingFade 
fixed procedural entity fade
 2016-08-05 16:48:51 -07:00
SamGondelman
b794259b7d fixed procedural entity fade 2016-08-05 16:15:10 -07:00
Sam Gondelman
84b7f9b186 Merge pull request #8375 from SamGondelman/loadingFade 
remove polyvox fade, fix web fade, add light fade
 2016-08-05 11:53:15 -07:00
SamGondelman
8494400047 don't use web entity texel color alpha as per tony's suggestion 2016-08-05 11:27:56 -07:00
SamGondelman
130e64aaba remove polyvox fade, possibly fix web fade 2016-08-05 10:36:48 -07:00
Brad Hefta-Gaub
83280aa3f2 implement support for updating the render items of models when they finish their fade 2016-08-05 10:11:07 -07:00
sam
e96fd92f32 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-08-05 09:28:45 -07:00
sam
92c0fa2e7a Testiung more variations 2016-08-05 09:26:48 -07:00
SamGondelman
b6e73e06a2 merge from master 2016-08-04 13:34:38 -07:00
Seth Alves
905c6147cf Merge branch 'master' of github.com:highfidelity/hifi into default-when-av-fails 2016-08-04 09:56:32 -07:00
SamGondelman
d7052f6250 try to make text entities fade 2016-08-03 16:27:51 -07:00
SamGondelman
7713c1f4bf try to fade in web entities 2016-08-03 15:56:41 -07:00
samcake
b4e5b60656 fixing ao 2016-08-03 15:45:22 -07:00
Anthony J. Thibault
f24c92f3a1 Bug fix for avatar debug marker rendering. 
"Developer > Hands > Show Hand Targets" works again
"Developer > Avatar > Draw Position" works again
 2016-08-03 15:43:31 -07:00
SamGondelman
27bacc9165 try to fade in procedural shapes 2016-08-03 14:33:05 -07:00
SamGondelman
2eb0c7735f working on fading shape entities 2016-08-03 13:30:05 -07:00
Seth Alves
c743cf379e use loadCollisionModelURLFinished when collisions model is finished 2016-08-03 11:31:51 -07:00
Seth Alves
ad4fc8c656 merge from upstream, don't hold up enabling of physics if a collision hull fails to load 2016-08-03 10:42:15 -07:00
SamGondelman
d63a0ef08f working on making other entities transparent 2016-08-02 18:09:42 -07:00
Stephen Birarda
5d3e125a06 make failed geomtetry request not hold physics 2016-08-02 16:32:41 -07:00
SamGondelman
5de21982be fix linux build 2016-08-02 11:44:17 -07:00
SamGondelman
ad5dec829c why did I change that 2016-08-02 10:52:51 -07:00
SamGondelman
3d08502080 space 2016-08-02 10:50:57 -07:00
SamGondelman
74f11eb70b try a different easing function 2016-08-02 10:50:31 -07:00
samcake
4ec971b449 MOre debugging 2016-08-01 23:17:32 -07:00
SamGondelman
0b5c7909b8 a calculated change 2016-08-01 18:45:25 -07:00
Seth Alves
b953e6f0ff when an avatar URL fails, switch to the default 2016-08-01 18:12:30 -07:00
SamGondelman
6154aaddda try to fix linux build 2016-08-01 16:19:03 -07:00
SamGondelman
ae0b9ea9a3 fade wireframes 2016-08-01 15:26:04 -07:00
SamGondelman
313ba87fce fade on texture load 2016-08-01 14:47:20 -07:00
SamGondelman
217a102926 working on loading fade 2016-08-01 13:15:55 -07:00
samcake
3ca1cdd645 Merging with master 2016-08-01 12:42:33 -07:00
samcake
beb42332ef save the current state of adding debug and evolving the ao job 2016-07-31 16:05:25 -07:00
SamGondelman
676f4bdfcf misc fixes from particles branch 2016-07-29 15:36:32 -07:00
Anthony Thibault
ea310bcc43 Web Entities now render correctly as well 2016-07-28 14:11:19 -07:00
Anthony Thibault
be6e401e9a Merge branch 'master' into bug-fix/web3doverlay-rendering 2016-07-28 11:20:35 -07:00
Anthony Thibault
6b8e912114 Fix for mac and linux builds 2016-07-28 10:02:19 -07:00
samcake
afb1ebf42e Revolutionizing ao 2016-07-26 23:19:41 -07:00
Bradley Austin Davis
fa20898285 Remove last direct use of gpu::Context::render() 2016-07-26 16:13:22 -07:00
Bradley Austin Davis
bb6abf11d3 FramebufferCache, cleanup & thread safety 2016-07-26 15:32:31 -07:00
Anthony J. Thibault
0a35c13a94 Moved creation of pipeline into call_once block 2016-07-25 16:30:29 -07:00
Anthony J. Thibault
fb84f058d6 Fix alpha cut-outs and incorrect gamma on Web3DOverlays 2016-07-25 15:56:05 -07:00
Chris Collins
e1e1ca1c12 Merge pull request #8306 from AndrewMeadows/fix-crash-on-avatar-change 
fix interface crash when chaning avatar models
 2016-07-25 12:11:46 -07:00
Chris Collins
3c9b9aef4f Merge pull request #8304 from ChristophHaag/fixGridShader 
fix grid shader
 2016-07-25 09:47:12 -07:00
Andrew Meadows
d876251f1e release geometry refs in Model::deleteGeometry() 2016-07-24 19:17:39 -07:00
Brad Davis
85b0440e32 Disable glow lines (and the use of geometry shaders) on non-Windows platforms for now 2016-07-23 11:06:33 -07:00
Christoph Haag
7134d2bfd4 fix grid shader 
this shader is used for example in
developer - audio - audio scope - show scope
 2016-07-23 11:09:16 +02:00
Ryan Downe Karpf
91714aaca6 Merge pull request #8258 from AlexanderOtavka/edit-model-ui 
Edit model dialog improvements
 2016-07-22 17:11:52 -07:00
samcake
1c4742e710 Fixing comments from review 2016-07-20 11:02:27 -07:00
Andrew Meadows
2afd65467a fix bug where model is not yet ready for col shape 2016-07-19 18:01:22 -07:00
samcake
8f663f20e0 FIx warnings 2016-07-19 13:24:03 -07:00
samcake
7f169b8e4f Adjust qml positions and fix one shader bug 2016-07-19 13:20:19 -07:00
samcake
3e7126f5be Removed reference to LIghtingModel.slh in teh DefereedBufferWrite.slh to avoid side effects 2016-07-19 13:06:26 -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
36d58a2b82 Finish the integration of the diffusion pass in the SurfaceGeometryPass job, clean up ui 2016-07-19 10:34:06 -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
80587ca8a3 using the textureGather lookup 2016-07-18 12:52:21 -07:00
samcake
be4839d46c a better depth filter 2016-07-18 12:26:04 -07:00
samcake
a4ad4659c4 Fixing build warnings 2016-07-18 11:17:06 -07:00
samcake
a44aee84ce Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-18 10:16:55 -07:00
samcake
86d9ee56d2 Downsampling shader pass 2016-07-18 03:56:11 -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
cfa51ae1f5 REmoving problematic timers for mac 2016-07-17 18:32:43 -07:00
samcake
9332f82d54 Carrefully improving the curvature generation performances 2016-07-17 17:13:07 -07:00
samcake
744474982d Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-17 13:28:03 -07:00
Brad Davis
03cb6175ab Support triangle and hexagon shapes, add shape support to overlays. 2016-07-15 22:02:17 -07:00
samcake
076b8cd297 Instrumenting the GPU git status 2016-07-15 17:47:54 -07:00
Brad Davis
b31300406a Don't extend glow line length 2016-07-15 16:20:05 -07:00
samcake
22ac95d463 REvisiting the RangeTimer to measure the real gpu duration 2016-07-15 09:12:16 -07:00
samcake
d69be5e4d2 Fixing the default value for the lightingMOdel flag when using debugDeferredLighting 2016-07-14 16:45:56 -07:00
samcake
776bcb6655 FIxing the web entity rendering 2016-07-14 15:49: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
f6671b34fa Fix the transformation problem for rendering the mini mirror (scattering is still screwed though) 2016-07-13 18:26:53 -07:00
samcake
219b41e813 Fix the mini mirror perf issue and improve the debugDeferredLighting script 2016-07-13 17:37:35 -07:00
Andrew Meadows
3e43859139 setCollisionModelURL() more symmetric with setURL() 2016-07-13 15:13:35 -07:00
Andrew Meadows
4bebb682dc namechange: fetchResource --> getGeometryResource 2016-07-13 15:13:35 -07:00
Andrew Meadows
9f7d2cf263 NetworkGeometry --> GeometryResourceWatcher 
Model class gets render and collision geometries with watchers
also changed names for readability
 2016-07-13 15:00:12 -07:00
Andrew Meadows
f6681d4b3d remove unused cruft 2016-07-13 15:00:12 -07:00
samcake
8acc18ae8b Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-13 11:42:07 -07:00
samcake
307243da8b cleaning compilation warnings and tuning the FBX material mapping pass 2016-07-13 11:04:53 -07:00
samcake
2c584f7690 Fixing a bad autoRef usage 2016-07-13 10:34:43 -07:00
samcake
9f91dd5bfc Cleaning the gpu-test app to work with the new deferred pipeline 2016-07-13 10:19:42 -07:00
samcake
51594fefa2 more clean up 2016-07-12 18:21:31 -07:00
Brad Hefta-Gaub
819cab4aab Merge pull request #8158 from sethalves/raypick-avatars 
Raypick avatars
 2016-07-12 15:27:30 -07:00
samcake
cde17ecaab Clenaing the rendering and the framebuffer allocations 2016-07-12 14:34:54 -07:00
samcake
504e9f154c Less comments 2016-07-12 09:18:02 -07:00