samcake
ede375a889
Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr
2015-12-08 12:28:16 -08:00
samcake
83279489f3
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-08 09:46:29 -08:00
Sam Cake
9faec326da
CHanging the lighting BUffer format and adding tone mapping
2015-12-08 08:34:42 -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
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
Sam Cake
3595d0d719
less commented stuff
2015-12-07 01:15:10 -08:00
Sam Cake
01d48b29aa
cleaning code and removing cruft
2015-12-07 01:03:14 -08:00
Sam Cake
a018c51945
Drawing background first in the Lighting buffer then lighting passes with stencil test
2015-12-06 23:51:29 -08:00
Sam Cake
dc4b6909bc
Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr
2015-12-06 18:58:11 -08:00
Atlante45
acb9e2774e
Basic implementation of debug zone resizing
2015-12-04 21:01:53 -08:00
Atlante45
41af377878
More g-buffer debugging options
2015-12-04 21:01:53 -08:00
samcake
dfd26bebae
Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr
2015-12-04 17:53:37 -08:00
samcake
b28e3d0045
Merging MAster and Graphics
2015-12-04 17:51:30 -08:00
Atlante45
b45b1cc513
More work on live g-buffer debug
2015-12-04 17:43:00 -08:00
samcake
119cc733b5
Merging with master
2015-12-04 17:17:33 -08:00
samcake
cfd7373585
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-04 16:52:50 -08:00
samcake
ef7ddce2b6
Trying to fix the problem of the background not showing correctly
2015-12-04 16:52:14 -08:00
samcake
a12188877a
Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr
2015-12-04 11:50:26 -08:00
samcake
3c18664c57
Cleaning all the deferred buffers in the Prepare call
2015-12-04 11:47:57 -08:00
Brad Hefta-Gaub
15c4dbfb11
Merge pull request #6554 from Atlante45/warnings
...
Last of the OpenGL warnings on OS X
2015-12-04 11:24:28 -08:00
Brad Hefta-Gaub
d07629489c
Merge pull request #6543 from Atlante45/pointer
...
gpu::Shader::create* return shared_ptr
2015-12-04 11:17:02 -08:00
Atlante45
ba2e7e1f29
Debug diffuse buffer
2015-12-04 11:15:06 -08:00
Atlante45
c27944ae28
Simple normal map debug
2015-12-04 10:44:23 -08:00
Atlante45
baf93e8a08
Add basic DebugDeferredBuffer job
2015-12-04 10:44:23 -08:00
Atlante45
528a17422d
Last of the OpenGL warnings on OS X
2015-12-04 10:33:10 -08:00
Brad Hefta-Gaub
d9a1563396
Merge pull request #6152 from sethalves/parents
...
Parents
2015-12-04 10:26:57 -08:00
Atlante45
07387ab8c0
Fix most OpenGL warnings
2015-12-04 10:01:43 -08:00
samcake
d593b824e9
Introducing a true Primary Framebuffer and a different Deferred Framebuffer
2015-12-03 17:26:54 -08:00
samcake
72d393905b
Introducing the Lighting Buffer where all the lighting is beeing accumulated, apply a manual gamma correction when copying back into the main color buffer
2015-12-03 16:03:32 -08:00
Atlante45
3da80f5861
gpu::Shader::create* return shared_ptr
2015-12-03 14:56:07 -08:00
Seth Alves
4e74c98ae7
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-12-03 11:00:13 -08:00
samcake
a5475ed14d
Early try fixing the lighting
2015-12-03 10:41:32 -08:00
Anthony J. Thibault
9c0b4bc2a2
Fix for model entities with non-uniform scaled mesh
...
Logic which extracted rotations from a non-uniformly scaled matrices was sometimes incorrect.
This should fix the roads in Qbit as well as the blocks in toybox.
2015-12-02 14:09:47 -08:00
Seth Alves
b7ebe5b92b
merge from upstream
2015-11-30 16:59:52 -08:00
Seth Alves
5c327edd5a
keep AvatarHashMap::findAvatar from creating bogus avatar entries. remove some more stray consts
2015-11-30 14:08:07 -08:00
Seth Alves
cf39cac7fc
attempt to make SpatiallyNestable data access thread-safe
2015-11-29 12:50:33 -08:00
Anthony J. Thibault
e2f031e77f
AnimDebugDraw Removed unused drawing code.
2015-11-21 10:57:39 -08:00
Anthony J. Thibault
fe683edb66
Avatar Debug Draw Default Pose now works
2015-11-21 10:53:24 -08:00
Seth Alves
f013f95e9b
merge from upstream
2015-11-21 08:43:00 -08:00
Anthony J. Thibault
2f37335d77
Warning fixes
2015-11-20 14:50:42 -08:00
Anthony J. Thibault
a77ea8da43
Removed JointStates! You won't be missed.
2015-11-20 14:15:37 -08:00
Anthony J. Thibault
982e2c06a9
Rig: Switched over to use AnimPoses instead of JointStates
...
* fixed debug rendering
* improved jointState/animPose diff detection code.
2015-11-19 12:14:04 -08:00
Anthony J. Thibault
721da29432
WIP checkpoint
...
* No longer normalizing scale in AnimSkeleton and AnimClip
This means graph is animating in 'geometry' coordinates
before unit scale is even applied. This is necessary to
properly work with both Avatar based models and ModelEntity
based models
Many things are broken.
* debug rendering (translations are x100)
* IK hand targets
* follow cam
* I did not even dare to try HMD mode
2015-11-18 18:47:33 -08:00
Anthony J. Thibault
55adedcec8
Merge branch 'master' into tony/remove-joint-states
2015-11-16 11:22:44 -08:00
Seth Alves
89ed3751ae
Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug
2015-11-14 14:00:20 -08:00
Stephen Birarda
429a4d51d5
Merge pull request #6375 from Atlante45/resize
...
Fix models resizing
2015-11-13 10:23:05 -08:00
Seth Alves
3519dd248b
Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug
2015-11-12 09:53:11 -08:00
