Sam Gateau
|
fdbf4e5288
|
cleaning code for review
|
2015-03-20 11:55:00 -07:00 |
|
Sam Gateau
|
5a40fcee17
|
set the defines for GPU profile correctly AGAIN
|
2015-03-17 16:51:59 -07:00 |
|
Sam Gateau
|
03da3aeab4
|
Clean up on the GPU Profile defines in order to control features
|
2015-03-17 16:15:10 -07:00 |
|
Stephen Birarda
|
471e55c8ce
|
fix some lingering warnings
|
2015-03-12 12:36:39 -07:00 |
|
Sam Gateau
|
853cf75f60
|
adding the atmosphere in the directional lighting pass, debug
|
2015-03-10 09:37:13 -07:00 |
|
Sam Gateau
|
d9c071a2a9
|
trying to put the atmospheric effect in a shader header and use it on the directional lighting pass
|
2015-03-10 00:47:27 -07:00 |
|
samcake
|
ee5409b0a8
|
fixing compilation on macosx
|
2015-03-09 14:25:59 -07:00 |
|
Sam Gateau
|
cc85f468d6
|
splitting the code of GLBackend into separate .cpp, adding the PIpeline,adn the state to gpu
|
2015-03-09 11:14:42 -07:00 |
|
Sam Gateau
|
23a6326aa1
|
testing the shader features in Model and refining the shader making workflow
|
2015-03-08 10:53:29 -07:00 |
|
Seth Alves
|
8a4339e57f
|
stray control-Ms
|
2015-03-07 07:52:20 -08:00 |
|
Sam Gateau
|
d5f6129082
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0bis
|
2015-03-06 10:44:15 -08:00 |
|
Sam Gateau
|
c097c6aad2
|
Adding the self introspection of shaders
|
2015-03-06 10:41:53 -08:00 |
|
Brad Hefta-Gaub
|
9649ed9936
|
Merge pull request #4371 from huffman/light-radius
Update Light to set direction when setting orientation
|
2015-03-03 15:50:04 -08:00 |
|
Ryan Huffman
|
3fef8a1622
|
Update Light to set direction when setting orientation
|
2015-03-03 12:41:51 -08:00 |
|
Sam Gateau
|
cb737d64d3
|
Testing the gpu::Shader compilation and building steps, ready to be used for real
|
2015-03-01 15:20:32 -08:00 |
|
Sam Gateau
|
660d9237e6
|
First version of the Shader and the magical shader program
|
2015-02-28 13:07:16 -08:00 |
|
Sam Gateau
|
ea88cbd75f
|
Merge with upstream master
|
2015-02-27 13:19:50 -08:00 |
|
Sam Gateau
|
f6a9bd1870
|
REfining the naming and introducing an orientation offset
|
2015-02-26 17:26:41 -08:00 |
|
Sam Gateau
|
e3b3c8e1ef
|
Setting the defalt at a better time of the day
|
2015-02-26 16:09:21 -08:00 |
|
Sam Gateau
|
d8ebb0c5b9
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
|
2015-02-26 14:19:23 -08:00 |
|
dev
|
b04dbf7a34
|
fixing compilation issue on macos
|
2015-02-26 11:27:40 -08:00 |
|
Sam Gateau
|
fcb293d0b2
|
CLean up before pr
|
2015-02-26 10:45:00 -08:00 |
|
Sam Gateau
|
a757229c0e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
|
2015-02-25 19:18:01 -08:00 |
|
Sam Gateau
|
4959e2924e
|
add an example script to control the sun light
|
2015-02-25 19:17:38 -08:00 |
|
Sam Gateau
|
6b29e314c2
|
Adding the Stage of the Scene and exposing control of the sun light from javascript
|
2015-02-25 19:05:27 -08:00 |
|
Leonardo Murillo
|
006b3ed0ac
|
Merge pull request #4300 from birarda/dependencies
NOT MERGEABLE - add some externals as cmake external projects
|
2015-02-25 13:22:49 -08:00 |
|
Sam Gateau
|
6070bf8a37
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
|
2015-02-18 16:02:18 -08:00 |
|
Sam Gateau
|
11060ed273
|
trying to tackle the unenderstood transform value not going through corectly?
|
2015-02-18 16:00:37 -08:00 |
|
Stephen Birarda
|
b2e587dbbd
|
remove use of include_dependency_includes and use cmake
|
2015-02-18 14:12:05 -08:00 |
|
Atlante45
|
5230b805d2
|
Fix warnings
|
2015-02-18 19:24:29 +01:00 |
|
Stephen Birarda
|
c110fcbfad
|
merge with upstream/master
|
2015-02-17 17:34:48 -08:00 |
|
Stephen Birarda
|
e99012efbb
|
updates to build guides to remove soxr
|
2015-02-17 10:33:12 -08:00 |
|
Andrew Meadows
|
53855c89e9
|
Merge pull request #4289 from birarda/dependencies
add gverb and glm as cmake external projects
|
2015-02-17 10:00:29 -08:00 |
|
Stephen Birarda
|
8c998a65ee
|
use the glm find_package and check externals
|
2015-02-13 12:50:32 -08:00 |
|
Stephen Birarda
|
1d90c1c827
|
use glm external project in model library
|
2015-02-13 10:31:41 -08:00 |
|
Sam Gateau
|
e2e61c64b1
|
Support include path to shaders from the hifi libraries to cmake
|
2015-02-13 01:30:04 -08:00 |
|
Sam Gateau
|
11beb51ec1
|
Clean up comments
|
2015-02-09 18:02:34 -08:00 |
|
Sam Gateau
|
1b22a3ef36
|
connecting the globalLight info to the DeferredLightingEffect
|
2015-02-05 17:30:57 -08:00 |
|
Sam Gateau
|
9b0036d010
|
adding Light and replace glLights also for the first deferred pass
|
2015-02-05 14:10:06 -08:00 |
|
Sam Gateau
|
00a9f55bc3
|
lightings seems to work correctly now
|
2015-02-05 10:20:19 -08:00 |
|
Sam Gateau
|
8e1eebbbd4
|
FInally getting the angular attenuation
|
2015-02-04 17:24:23 -08:00 |
|
Sam Gateau
|
16f12dd267
|
working on the point light shader edge representation
|
2015-02-02 16:31:36 -08:00 |
|
Sam Gateau
|
b6836af071
|
improving on the poin light attenuatiion formula
|
2015-01-28 00:09:15 -08:00 |
|
Sam Gateau
|
db427cdf5e
|
adding Light class in model and the shader in render utils
|
2015-01-27 15:45:10 -08:00 |
|
Sam Gateau
|
ae3233b119
|
in the middle of something
|
2015-01-27 15:44:10 -08:00 |
|
Sam Gateau
|
4302db109f
|
First take at using the gpu::Texture in the Model rendering instead of the previous pass with raw glTexture
|
2015-01-20 16:02:26 -08:00 |
|
Sam Gateau
|
6b88eaceb5
|
FIx typos
|
2014-12-22 15:44:46 -08:00 |
|
Sam Gateau
|
1ae682ff21
|
fix end line typo
|
2014-12-22 11:36:18 -08:00 |
|
Sam Gateau
|
4c670ac17a
|
merging with upstream master and origin temp0
|
2014-12-22 10:38:11 -08:00 |
|
Sam Gateau
|
967c6dbc4b
|
Add the Model library
|
2014-12-19 16:19:06 -08:00 |
|