Seth Alves
|
ab86b1d90a
|
code review
|
2015-05-28 10:29:23 -07:00 |
|
Seth Alves
|
c3c701f807
|
polyvox no longer has a color
|
2015-05-27 15:23:01 -07:00 |
|
Seth Alves
|
8cb5717b86
|
formatting, cleanups
|
2015-05-27 15:16:15 -07:00 |
|
Seth Alves
|
5e66a079c4
|
make this build on older gcc
|
2015-05-27 10:38:15 -07:00 |
|
Seth Alves
|
728e6d121b
|
changes sam made to get normals to work on a mesh
|
2015-05-26 14:12:01 -07:00 |
|
Sam Cake
|
765145b898
|
Moving the load of the texture and the generation of the cube map irradiance in the same thread
|
2015-05-15 11:28:59 -07:00 |
|
Brad Hefta-Gaub
|
d1f52231be
|
Merge pull request #4863 from samcake/orange
Using the skymap for ambient lighting
|
2015-05-14 09:12:46 -07:00 |
|
Brad Hefta-Gaub
|
77019eafa7
|
Merge pull request #4831 from jherico/plugins_pt2
Display plugins part 2
|
2015-05-13 20:40:33 -07:00 |
|
Sam Cake
|
65e83df214
|
Generating the SH from the cube map!
|
2015-05-13 11:08:18 -07:00 |
|
Sam Cake
|
536fff4502
|
Trying to create the SH from the skybox cubemap
|
2015-05-12 23:11:52 -07:00 |
|
Sam Gateau
|
45e70c98f8
|
Fixed the cube map loading issue
|
2015-05-11 13:43:15 -07:00 |
|
Brad Davis
|
abab54aed8
|
Working on display plugins
|
2015-05-11 13:08:53 -07:00 |
|
Sam Gateau
|
72c3270ec6
|
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
|
2015-05-11 10:48:29 -07:00 |
|
Sam Gateau
|
f1fcce3ea0
|
refactoring th ecube texure loading to support 2 different layouts
|
2015-05-11 10:47:45 -07:00 |
|
Seth Alves
|
68e01d2bd9
|
quiet compiler
|
2015-05-10 17:03:42 -07:00 |
|
Sam Gateau
|
5a11143a5d
|
Using the skybox cubemap for ambient lighting
|
2015-05-09 11:40:46 -07:00 |
|
Sam Gateau
|
ce5295a55f
|
THese is not final but we have a basic working framework so let's try to share
|
2015-05-07 17:06:15 -07:00 |
|
Sam Gateau
|
54c47fe3f9
|
merging
|
2015-05-07 11:35:58 -07:00 |
|
Sam Gateau
|
653d2e72b1
|
Skybox kind of working
|
2015-05-07 11:23:11 -07:00 |
|
Atlante45
|
cafaeed822
|
Restore polygon mode after entities rendering
Default setting are causing issues so we just reset the polygon mode
since this won't matter once everything has moved to the new rendering
pipeline.
|
2015-05-07 13:34:22 +02:00 |
|
Atlante45
|
366964e424
|
Fix static initialisation fiasco
|
2015-05-07 13:00:56 +02:00 |
|
Atlante45
|
721eeccce2
|
Restaure GL to default after we render a batch
|
2015-05-07 12:01:22 +02:00 |
|
Sam Gateau
|
00c45dbb43
|
missing includes
|
2015-05-06 12:38:12 -07:00 |
|
samcake
|
06e1330e42
|
Clean up the includes in gpu, make the skybox shader works
|
2015-05-06 12:12:54 -07:00 |
|
samcake
|
50012ee9de
|
fixing build issues on MAc
|
2015-05-06 11:00:37 -07:00 |
|
Sam Gateau
|
fe3b5d1867
|
preparing for PR, back to the default background mode SKy_DOME
|
2015-05-06 10:27:31 -07:00 |
|
Sam Gateau
|
dc81a3ecc2
|
Cube texture are working with the GL backend, useing it in SKybox successfullly
|
2015-05-06 09:53:36 -07:00 |
|
Sam Gateau
|
ade404a74d
|
getting rid of QSHaredPointer in favor of std::shared_ptr
|
2015-05-04 13:43:30 -07:00 |
|
Seth Alves
|
0341caad95
|
quiet compiler
|
2015-05-03 11:10:52 -07:00 |
|
samcake
|
c8e5b35de9
|
Fixing typo
|
2015-05-01 12:04:15 -07:00 |
|
samcake
|
6da796f735
|
fix the bug with sahdows on Mac due to the fbo needing a colorbuffer even though it's not needed
|
2015-04-30 23:31:56 -07:00 |
|
Seth Alves
|
b69cba1aba
|
respond to code-review
|
2015-04-25 10:50:18 -07:00 |
|
Seth Alves
|
0fb1a83e3b
|
quiet compiler, remove some trailing control-Ms
|
2015-04-25 09:20:00 -07:00 |
|
Sam Gateau
|
8b97d2585a
|
fixing syntax issues
|
2015-04-15 10:16:04 -07:00 |
|
Sam Gateau
|
598abe6722
|
Cleaning up Frambuffer.h
|
2015-04-14 18:48:06 -07:00 |
|
Sam Gateau
|
fec52f6b10
|
Removing almost all the QFramebufferObject (instead in overlay layer) in favor of gpu::Framebuffer, eveyrthing seems to work properly
|
2015-04-14 18:27:24 -07:00 |
|
Sam Gateau
|
87030236cb
|
working version with the gpu::SAmpler and the gpu::Framebuffer
|
2015-04-14 15:53:24 -07:00 |
|
Sam Gateau
|
c34c5f6075
|
adding the Fremabuffer to be used for shadows and main rendering
|
2015-04-14 08:47:52 -07:00 |
|
Sam Gateau
|
51ce3129b9
|
connecting the dots for a framebuffer GLBackend, need to be tested
|
2015-04-13 12:22:08 -07:00 |
|
Sam Gateau
|
05689c0413
|
Bringin the Framebuffer to GLBackend and refining the interface
|
2015-04-13 11:13:30 -07:00 |
|
Sam Gateau
|
69484ad00b
|
Creating the Framebuffer class and the companion Swapbuffer
|
2015-04-12 17:36:45 -07:00 |
|
Andrew Meadows
|
e9159304d2
|
Merge pull request #4617 from sethalves/acceleration-and-owner-in-wire-protocol
Acceleration and owner in wire protocol
|
2015-04-10 09:07:47 -07:00 |
|
David Rowe
|
ae3d606e95
|
Replace try with nothrow
|
2015-04-09 10:01:31 -07:00 |
|
David Rowe
|
b2dd53ac43
|
Coding standard
|
2015-04-09 08:37:24 -07:00 |
|
David Rowe
|
e768852645
|
Fix catching bad_alloc
Non-allocation wasn't caught on Windows; it just crashed.
|
2015-04-08 20:02:22 -07:00 |
|
Seth Alves
|
2448051c75
|
Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol
|
2015-04-08 15:39:40 -07:00 |
|
Seth Alves
|
5c709e2638
|
quiet compiler
|
2015-04-08 15:39:07 -07:00 |
|
samcake
|
4fb5c8f907
|
fix the rendering bug on mac release due to the State::DepthTest not properly aligned to 4bytes. Improved the glCheckError for knowing where the error comes from.
|
2015-04-08 11:04:13 -07:00 |
|
Andrew Meadows
|
a47170b02c
|
Merge pull request #4601 from samcake/temp1
Introducing gpu::State and using it in the Model rendering path and more...
|
2015-04-07 12:48:42 -07:00 |
|
Seth Alves
|
ef5dffecf6
|
fix filenames in comments
|
2015-04-07 10:03:14 -07:00 |
|