samcake
|
3554f54e17
|
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
|
2015-12-14 17:38:56 -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
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Seth Alves
|
a948ae5f19
|
children of avatar joints might be right, now
|
2015-12-06 10:48:00 -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 |
|