Sam Gateau
|
07bcd115c2
|
trying to remove useless glsl code for Legacy path
|
2015-03-20 13:28:42 -07:00 |
|
Sam Gateau
|
5063159581
|
cleaning code for review
|
2015-03-20 12:00:16 -07:00 |
|
Sam Gateau
|
fdbf4e5288
|
cleaning code for review
|
2015-03-20 11:55:00 -07:00 |
|
samcake
|
d2868bcafc
|
fixing the shader for mac
|
2015-03-19 16:00:47 -07:00 |
|
Sam Gateau
|
619a323196
|
Using Scribe preprocessor @func@ instead of regular glsl function to solve the intel bug with the transform stack
|
2015-03-19 14:46:50 -07:00 |
|
Sam Gateau
|
b33ba64e05
|
trying to tweek the transform equation to find the intel bug
|
2015-03-18 17:20:27 -07:00 |
|
samcake
|
0f22d64802
|
compilation on MacOSX
|
2015-03-18 16:28:42 -07:00 |
|
Sam Gateau
|
414315b6e0
|
Since glProgramUniform is not supported on MAc we need a workaround...
|
2015-03-18 16:15:06 -07:00 |
|
Sam Gateau
|
b5eb4a7f5b
|
Since glProgramUniform is not supported on MAc we need a workaround...
|
2015-03-18 16:12:47 -07:00 |
|
Sam Gateau
|
0bd78be7f4
|
Transition model shaders to gpu:Shader
|
2015-03-18 15:57:01 -07:00 |
|
Sam Gateau
|
5a40fcee17
|
set the defines for GPU profile correctly AGAIN
|
2015-03-17 16:51:59 -07:00 |
|
Sam Gateau
|
74ae0c4a85
|
set the defines for GPU profile correctly
|
2015-03-17 16:35:32 -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 |
|
Brad Davis
|
fd29f72bfe
|
Making nsight usage optional (still defaults to on)
|
2015-03-16 12:59:41 -07:00 |
|
Seth Alves
|
af10c2274b
|
remove stray carriage returns
|
2015-03-15 08:24:49 -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 |
|
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 |
|
Andrew Meadows
|
c3a4e5d94b
|
fix dark lighting and missing avatars on linux
|
2015-03-04 16:52:27 -08:00 |
|
Sam Gateau
|
cad2184927
|
FIxing the compilation issue for linux
|
2015-03-03 11:09:11 -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
|
d8ebb0c5b9
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
|
2015-02-26 14:19:23 -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
|
6b29e314c2
|
Adding the Stage of the Scene and exposing control of the sun light from javascript
|
2015-02-25 19:05:27 -08:00 |
|
Andrew Meadows
|
7b68916010
|
Merge pull request #4343 from ZappoMan/hangOnExit
BUG FIX: Hang on exit
|
2015-02-25 17:02:26 -08:00 |
|
ZappoMan
|
05d7d47045
|
some cleanup
|
2015-02-25 16:32:48 -08:00 |
|
ZappoMan
|
5eecb6a837
|
correctly delete glbuffers
|
2015-02-25 14:44:10 -08:00 |
|
Sam Gateau
|
65a3e3618a
|
Trying to setup correctly the projection matrix for all the different cases...
|
2015-02-23 17:06:46 -08:00 |
|
Sam Gateau
|
90bff36fd3
|
trying to ge the shadow to render correctly
|
2015-02-22 18:48:48 -08:00 |
|
dev
|
05ae1b6fe6
|
fixing the mac osx code path for Transform
|
2015-02-20 15:20:34 -08:00 |
|
Sam Gateau
|
987562976a
|
Fixing the remaining issue with the avatar rendering path
|
2015-02-20 14:46:36 -08:00 |
|
Stephen Birarda
|
5e264f8241
|
add GLEW as dependency external project
|
2015-02-20 13:47:38 -08:00 |
|
Sam Gateau
|
4e2d2bc188
|
Fixing the remaining issue with the avatar rendering path
|
2015-02-20 12:05:06 -08:00 |
|
Sam Gateau
|
ded78816b5
|
Fixing the remaining issue with the avatar rendering path
|
2015-02-20 11:26:08 -08:00 |
|
Sam Gateau
|
d08142d37d
|
replacing glTRansform by gpu/Transform features
|
2015-02-19 15:12:13 -08:00 |
|
Sam Gateau
|
7e04f8a491
|
Model almost working with Transform
|
2015-02-19 09:52:58 -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 |
|
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 |
|
Sam Gateau
|
d8aa0e0138
|
replacing the glTransform pipeline for model rendering
|
2015-02-17 09:44:03 -08:00 |
|
Sam Gateau
|
23354da828
|
replacing the glTransform pipeline for model rendering
|
2015-02-16 22:08:21 -08:00 |
|
Sam Gateau
|
cc3cc4f96f
|
replacing the glTransform pipeline for model rendering
|
2015-02-16 09:31:29 -08:00 |
|
Brad Hefta-Gaub
|
1827d9f3cd
|
Merge pull request #4256 from samcake/temp1
Getting rid of glLIghts and replacing by the model::Light
|
2015-02-13 10:49:53 -08:00 |
|
Stephen Birarda
|
54ce79db5a
|
remove glm dependency in gpu library
|
2015-02-13 10:29:19 -08:00 |
|