samcake
de7aed1abc
Merge pull request #5338 from ZappoMan/removeGlowEffect
...
Remove the glow effect.
2015-07-15 14:50:15 -07:00
ZappoMan
c17794849d
more GlowEctomy
2015-07-15 12:58:15 -07:00
ZappoMan
819fa852b8
first pass at GlowEctomy
2015-07-15 12:47:59 -07:00
samcake
9df26c8488
removing naked glViewport from DeferredLightingEffect by adding the current viewport in renderArgs
2015-07-15 00:24:43 -07:00
samcake
a6148ab73d
Remove naked gl call
2015-07-14 22:59:55 -07:00
ZappoMan
47dad82d50
removed dead code
2015-07-14 18:09:58 -07:00
ZappoMan
d19c7125da
remove naked gl calls
2015-07-14 16:49:43 -07:00
Atlante45
8fb69ecc96
Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart
2015-07-14 13:50:58 -07:00
Clément Brisset
17c6f41db6
Merge pull request #5306 from ctrlaltdavid/20606
...
CR for 20606 - If an external texture isn't found, still display the model
2015-07-14 13:49:00 -07:00
Atlante45
7bf45308b6
Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart
2015-07-14 12:31:37 -07:00
David Rowe
2bab7d1c03
Add parentheses
2015-07-13 16:38:51 -07:00
Sam Gateau
5555ccd225
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2015-07-13 16:19:09 -07:00
Sam Gateau
4743bbad80
Adding shaders to the lib for rendering simple textured quad and solve the ImageOverlay issue for edit.js
2015-07-13 16:18:39 -07:00
Clément Brisset
24eb4c8263
Merge pull request #5309 from sethalves/quiet-compiler
...
quiet compiler
2015-07-13 15:55:35 -07:00
David Rowe
d44743563b
Merge branch 'master' into 20606
...
Conflicts:
libraries/render-utils/src/Model.cpp
2015-07-13 07:53:04 -07:00
Seth Alves
fb23eb0faf
Merge pull request #5301 from samcake/yellow
...
Rename gpu::Batch::setUniformTexture into gpu::Batch::setResourceTexture
2015-07-12 11:36:03 -07:00
Seth Alves
c17c9f1818
quiet compiler
2015-07-12 10:29:43 -07:00
David Rowe
8ecefdfe39
If an external texture isn't found, still display the model
...
If the texture is present the next Interface is run then it will be used.
2015-07-10 16:03:27 -07:00
Atlante45
c11864acf3
Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart
2015-07-10 15:57:40 -07:00
Atlante45
a3848f08d2
Conditionnal fixes.
2015-07-10 15:36:17 -07:00
Atlante45
49993695a5
Made geometry refresh safe
2015-07-10 15:20:19 -07:00
Atlante45
5cfa1605df
Made Texture safe with resource refresh
2015-07-10 12:28:06 -07:00
Atlante45
6c591131ba
Made Animations safe for resource reload
2015-07-10 12:01:51 -07:00
Sam Gateau
6c04e6d382
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2015-07-10 11:59:31 -07:00
samcake
014802fd45
Merge pull request #5277 from venkatn93/gpuquery
...
GPU Query infrastructure
2015-07-10 11:59:08 -07:00
Sam Gateau
2c05349b06
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-10 11:10:07 -07:00
Sam Gateau
7fc9fd97ff
Replacing setUniformTexture by setResourceTexture in order to differenciate the 2 types of binding points for the BUffers.
2015-07-10 11:03:12 -07:00
Brad Davis
6c5d7b8789
Performance optimizations in transform buffers and geometry cache
2015-07-09 17:53:26 -07:00
Sam Gateau
11f2d74030
Simple cleaning to remove dependancies on the viewStateInterface in the deferredLightingEffect
2015-07-09 17:33:25 -07:00
Brad Hefta-Gaub
f0a1bc15a9
Merge pull request #5286 from samcake/daft
...
Migrating the rendering openGL calls from DeferredLightingEffect to gpu::Batch
2015-07-09 15:23:45 -07:00
Sam Gateau
8c178d03df
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
2015-07-09 15:16:52 -07:00
samcake
1f13106f51
FIxed the issue on mac due to the abs function not correctly executing
2015-07-09 15:05:03 -07:00
Brad Davis
06563264e2
Improve batched font rendering smoothing
2015-07-09 14:34:33 -07:00
Sam Gateau
2968286779
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
2015-07-09 11:19:45 -07:00
Sam Gateau
110b009aa4
Less magic in this world
2015-07-09 09:55:25 -07:00
Sam Gateau
8f4a108441
Dead code and disable debug info
2015-07-09 09:37:35 -07:00
Sam Gateau
fb37af3e04
Removing dead code
2015-07-09 09:25:07 -07:00
Sam Gateau
e901d5cad0
Uncommented a block left behind...
2015-07-09 09:21:53 -07:00
Brad Hefta-Gaub
fb07956689
Merge pull request #5284 from hyperlogic/ajt/mirror-view-fix
...
fix for mirror rendering on windows
2015-07-09 08:38:55 -07:00
Sam Gateau
6b229d8d2d
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
2015-07-09 03:45:55 -07:00
Sam Gateau
8314fe8c7f
FInally getting a nice spot light volume working for all angles
2015-07-09 03:45:19 -07:00
Anthony J. Thibault
1be0e7ebc3
fix for mirror rendering on windows
...
* added preScale to Transform class.
* preScale by -1 about the xAxis instead of post scale.
I think this was working on Mac due to the different code paths in
GLBackendTransform::updateTransform for core vs legacy gl profile.
2015-07-08 21:33:27 -07:00
Niraj Venkat
1894b42773
Added EXT support for Mac GL Query calls
2015-07-08 16:11:36 -07:00
Sam Gateau
4c44eb63da
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-08 14:25:41 -07:00
Sam Gateau
f992e875b4
Adding intrsumentation for nsight and hiding the nsight specific code in cpp
2015-07-08 14:25:13 -07:00
Niraj Venkat
7e59be6196
First take oon the query for the gpu
2015-07-08 10:00:58 -07:00
samcake
5557dc4da2
clean and release the new deferredLIghtingEffect
2015-07-07 10:00:05 -07:00
Atlante45
541d9ae431
Merge branch 'master' of https://github.com/highfidelity/hifi into fix_billboard
2015-07-06 18:05:43 -07:00
Sam Gateau
fe633cd545
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-06 15:04:02 -07:00
samcake
a2f6693bd7
getting the deferred lighting to work
2015-07-06 14:40:10 -07:00
