Commit graph

1507 commits

Author SHA1 Message Date
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
Atlante45
78b805a19a Fix file shader file lookup on windows 2015-12-17 16:06:55 -08:00
Atlante45
c0a675dd9e Fix msvc warning 2015-12-17 16:02:49 -08:00
Atlante45
f41ca9fc50 More custom debug work 2015-12-17 15:18:23 -08:00
Atlante45
d8a389ff92 First cut at custom pipelines 2015-12-17 15:18:23 -08:00
Atlante45
9d6618c341 Cleanup DebugDeferredBuffer code 2015-12-17 15:18:23 -08:00
samcake
d8a71db929 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-17 10:11:03 -08:00
samcake
1b1365fd40 Exposing the tone curve in the js api 2015-12-16 16:32:53 -08:00
samcake
c0faf978f8 Introducing a setting for the tone curve 2015-12-16 15:21:09 -08:00
AlessandroSigna
08f7591787 Fix misspelling 2015-12-16 10:02:47 -08:00
samcake
7c8f12b9c4 Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr 2015-12-16 09:55:37 -08:00
samcake
b4b541178d Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-16 09:42:06 -08:00
samcake
a60ef4fb5a Finalize the names 2015-12-15 18:32:30 -08:00
samcake
c2feec16de Cleaning the code 2015-12-15 18:24:16 -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
2bbd5d86b8 cleaning indentation 2015-12-15 09:46:18 -08:00
samcake
e70ab472af Merging with upstream master/graphics 2015-12-14 18:38:29 -08:00
samcake
84d1e3b123 Merged with upstream master 2015-12-14 18:30:24 -08:00
samcake
a50b14dfae Merging with upstream graphics 2015-12-14 18:18:39 -08:00
samcake
3554f54e17 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-14 17:38:56 -08:00
Anthony J. Thibault
3f0cdb3c02 Merge branch 'master' into tony/js-avatar-default-pose 2015-12-14 11:19:24 -08:00
samcake
b3acde4462 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-11 17:49:00 -08:00
Atlante45
146581714a More warning fixes 2015-12-11 16:17:41 -08:00
Atlante45
f308ef7aa9 Move QOpenGL wrappers to the gl lib 2015-12-11 16:17:17 -08:00
Atlante45
d3224bfde3 More warning fixes 2015-12-11 16:03:44 -08:00
Atlante45
ce51350b65 Fix warnings on windows 64bit 2015-12-11 15:42:15 -08:00
samcake
94b6ca4450 FIxing the bad lambda capture for local variables 2015-12-11 10:48:58 -08:00
samcake
5d395ae54f Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-10 18:06:43 -08:00
samcake
c74bbda663 Nothing fancy 2015-12-10 18:02:02 -08:00
samcake
20f3d6abe1 REmoving comments 2015-12-10 16:52:03 -08:00
samcake
dffb83a488 Potentially working correctly 2015-12-10 16:31:00 -08:00
samcake
5805cc8f2b Adding the AABox transform features (from Extents) adn introducing a simple MeshPartPayload to render simple geometry 2015-12-10 14:59:04 -08:00
Anthony J. Thibault
652ce5501f Expose Avatar default pose to JavaScript
New JavaScript API to get the avatar's default pose.

   MyAvatar.getDefaultJointRotation(index);
   MyAvatar.getDefaultJointTranslation(index);

See `examples/tPose.js` for example usage
2015-12-10 13:57:31 -08:00
samcake
f9269523a1 Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-12-09 16:58:56 -08:00
samcake
9eb40bcd65 Trying to redner the collision geometry correctly but still an issue with the bounding box i get 2015-12-09 16:58:14 -08:00
samcake
1adf2cc8ba Repesenting the collision meshes of a Model correctly 2015-12-08 16:45:12 -08:00
Brad Hefta-Gaub
1356fb15aa Merge pull request #6591 from jherico/zaan
Add sphere and cube triangle counts to displayed stats
2015-12-08 13:27:37 -08:00
samcake
ede375a889 Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr 2015-12-08 12:28:16 -08:00
Bradley Austin Davis
011a43d5f2 Add sphere and cube triangle counts to displayed stats 2015-12-08 11:08:22 -08:00
samcake
83279489f3 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-08 09:46:29 -08:00
Seth Alves
dffa37c0e7 Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-12-08 09:44:50 -08:00
Sam Cake
9faec326da CHanging the lighting BUffer format and adding tone mapping 2015-12-08 08:34:42 -08:00
samcake
b24af06589 Fixing the display of the collision hull mesh 2015-12-07 18:26:55 -08:00
samcake
d12fdb9726 Merge pull request #6584 from birarda/pref-no-auto
fix for avatar URL text editing, assert in Model.cpp
2015-12-07 18:11:49 -08:00
Stephen Birarda
6dbff93bbd fix assert on model URL change from _renderItemsSet 2015-12-07 16:24:26 -08:00
Seth Alves
f99812a903 adjust method names to fit convention 2015-12-07 14:31:08 -08:00
samcake
9ddc3c27bf compilation errors fixed 2015-12-07 13:25:55 -08:00
samcake
5d207d0c9c INtroducing the tonemapping job in its separate file and clean DeferredLightingEffect 2015-12-07 13:19:43 -08:00
Atlante45
f8ee377f01 Fix QOpenGL warning 2015-12-07 08:37:07 -08:00