Brad Davis
9016f437a8
Merge pull request #5371 from Atlante45/smart_pointers
...
Smart pointers fixes
2015-07-21 08:52:29 -07:00
Brad Davis
c3a2b72c13
Breaking framebuffer ops out of texture cache
2015-07-20 17:26:26 -07:00
Sam Gateau
59666f664a
merging my changes to remove cruff from application to AUstin;s latest
2015-07-20 15:37:17 -07:00
Atlante45
59acfc9f47
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-20 13:51:51 -07:00
Brad Davis
359abd6474
Merge branch 'master' into plugins
...
Conflicts:
interface/CMakeLists.txt
interface/src/Application.cpp
interface/src/Application.h
interface/src/GLCanvas.cpp
interface/src/GLCanvas.h
interface/src/devices/OculusManager.cpp
interface/src/devices/OculusManager.h
interface/src/devices/TV3DManager.cpp
interface/src/ui/overlays/LocalModelsOverlay.cpp
libraries/render-utils/src/OffscreenGlCanvas.cpp
libraries/render-utils/src/OffscreenGlCanvas.h
libraries/render-utils/src/text/EffectType.h
2015-07-20 13:33:24 -07:00
Sam Gateau
1a9f6e12a5
something not compiling but just before merge with upstream
2015-07-20 12:20:04 -07:00
Brad Davis
d4e637c5b8
Removing superfluous lighting and naked GL in mirror
2015-07-20 09:36:05 -07:00
Brad Davis
35f7307f30
More header cleanup
2015-07-18 22:15:50 -07:00
Bradley Austin Davis
5e0a0409bf
Removing setupWorldLight from viewstateinterface
2015-07-18 12:16:51 -07:00
Brad Davis
b7fdfd8663
Working on lighting
2015-07-18 10:55:53 -07:00
Brad Davis
d68618e206
Removing GL headers from most files, and some naked GL from application.cpp
2015-07-18 00:46:09 -07:00
Atlante45
256c786e28
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-17 17:59:19 -07:00
Brad Davis
c822e66317
Merge pull request #5346 from samcake/daft
...
Adding the scissor rect in the Batch and a way to enable the scissor during clear command
2015-07-17 17:04:42 -07:00
Sam Gateau
9eff19b0f7
add th emissing function
2015-07-17 15:47:17 -07:00
ZappoMan
ccd2f98a76
one more try
2015-07-17 15:28:25 -07:00
Brad Davis
ae882c8347
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
interface/src/Menu.cpp
interface/src/Menu.h
interface/src/avatar/SkeletonModel.cpp
interface/src/devices/OculusManager.cpp
interface/src/devices/TV3DManager.cpp
interface/src/ui/ApplicationCompositor.cpp
interface/src/ui/overlays/LocalModelsOverlay.cpp
2015-07-16 16:37:55 -07:00
Sam Gateau
50a521e1f2
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
2015-07-16 12:38:47 -07:00
Sam Gateau
4ca333efe1
Adding the scissor rect in the Batch and a way to enable the scissor test locally for clear commands
2015-07-16 12:38:11 -07:00
ZappoMan
d1e511efcb
more naked gl cleanup, deleting dead code, tweaking comments so they don't give false positives in searching for more naked gl
2015-07-15 15:52:12 -07:00
Sam Gateau
440464f884
Trying to improve the GLBackendINtpu cahce a bit and thinking about moving to core profile
2015-07-14 18:35:11 -07:00
Brad Davis
f8144e4ee2
Merge branch 'master' into plugins
2015-07-13 19:52:53 -07:00
samcake
99ae0326ad
FIxing th ecompilation issue on mac, ready to ship
2015-07-13 19:17:09 -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
Brad Davis
9eb15d3d55
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/GLCanvas.cpp
interface/src/devices/OculusManager.cpp
interface/src/devices/OculusManager.h
libraries/render-utils/src/DeferredLightingEffect.cpp
2015-07-13 12:54:19 -07:00
Seth Alves
5aca0c28ef
quiet compiler
2015-07-13 07:37:59 -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
Atlante45
80fe090a94
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-10 20:20:03 -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
Niraj Venkat
2e5fd04d9e
Fix to get build working on Linux
2015-07-10 11:27:34 -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
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
Niraj Venkat
58f127f299
Fixing names of GL enums
2015-07-08 17:17:31 -07:00
Niraj Venkat
1894b42773
Added EXT support for Mac GL Query calls
2015-07-08 16:11:36 -07:00
Niraj Venkat
4478d76618
attempt #3 - fixing ubuntu build
2015-07-08 15:28:25 -07:00
Niraj Venkat
250d2e9e2c
attempt #2 to fix jenkins build error
2015-07-08 15:14:28 -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
a6ec668b2e
attempt #1 to fix jenkins build error
2015-07-08 14:24:24 -07:00
Niraj Venkat
7e59be6196
First take oon the query for the gpu
2015-07-08 10:00:58 -07:00
Brad Davis
a04921e74b
Merge branch 'master' into plugins
2015-07-07 11:10:51 -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
Brad Davis
95000eec3c
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/src/ui/overlays/LocalModelsOverlay.cpp
2015-07-06 16:22:03 -07:00
samcake
a2f6693bd7
getting the deferred lighting to work
2015-07-06 14:40:10 -07:00
Atlante45
d243190caf
Coding standard
2015-07-04 16:06:39 -07:00
samcake
4019a216d4
Fixed the viewport expressed in int not getting to the shader, needed to be convert to float
2015-07-03 12:12:54 -07:00
samcake
84b70fbaca
Mergin yellow with the Status bar rendering into Daft cwith the switch to batch for deferred pass
2015-07-03 11:36:19 -07:00
Brad Davis
2a1776303d
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/avatar/SkeletonModel.cpp
interface/src/devices/OculusManager.cpp
interface/src/devices/TV3DManager.cpp
2015-07-03 06:17:35 -07:00
Bradley Austin Davis
0034a14fc1
Working on mac functionality
2015-07-02 18:14:12 -07:00
Sam Gateau
8d8a902328
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-02 15:06:32 -07:00
Sam Gateau
be8fe25338
Trying to finalize the look and behavior of th estatus indicators
2015-07-02 15:06:07 -07:00
Brad Hefta-Gaub
2a03f62bf2
Merge pull request #5232 from sethalves/actions-over-wire-and-sim-ownership
...
Actions over wire and improved simulation ownership
2015-07-02 14:57:27 -07:00
Brad Davis
5abf08817e
Trying to fixup the plugins compilation
2015-07-02 00:00:00 -07:00
Bradley Austin Davis
54bbc841e2
Working on mac compilability
2015-07-01 23:03:33 -07:00
Atlante45
7b5a5a339a
Use make_shared/create to make shared pointers
2015-07-01 19:46:06 -07:00
samcake
b23f68107c
Adding the gpu_shader4 for linux and fixing function name for mac
2015-07-01 14:52:23 -07:00
Sam Gateau
2f04a9d3da
refining the shader pipeline and trying to pass a Status Getter from the model and fails
2015-07-01 07:47:46 -07:00
Sam Gateau
8bd5e15f73
Exposing the viewport to the shader and have a first draft of the draw status pipeline
2015-06-30 14:43:57 -07:00
Sam Gateau
20cb519c14
first draft at using the status of the item for representing stats and current data about it in the DrawStatus phase
2015-06-30 08:19:00 -07:00
samcake
1b69b38835
fix shader issue on mac
2015-06-27 06:34:58 -07:00
Atlante45
3c49e6231e
Sam's fix for pipeline edge case
...
Basically if we bind a uniform texture and the pipeline is not setup
correctly on mac
2015-06-26 16:17:40 -07:00
Sam Gateau
f73e56a93f
Covering all the case for rendering the light passes
2015-06-26 15:45:15 -07:00
Sam Gateau
c41ebcae78
Covering all the case for rendering the light passes
2015-06-26 15:40:08 -07:00
Brad Davis
fbf3a0cbe6
Working on GL 4
2015-06-23 09:48:16 -07:00
Bradley Austin Davis
0000b5a8c8
Working on GL 4.1 core
2015-06-23 09:48:15 -07:00
Brad Davis
f51c43f90d
Working on GL 4.1
2015-06-23 09:47:18 -07:00
Seth Alves
f75506bf1b
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-22 15:37:10 -07:00
Sam Gateau
9994cb7540
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
2015-06-22 20:00:48 +02:00
Sam Gateau
6444bcab1b
commenting out
2015-06-22 20:00:06 +02:00
Seth Alves
03a2d190b0
quiet valgrind
2015-06-22 07:18:55 -07:00
samcake
ca652730b5
REfine the gpu/Context.slh to get gpu_shader4 and gl_VertexID
2015-06-22 15:47:13 +02:00
Sam Gateau
f7ca1f608f
Migrating the deferred lighting effect to Batch and in doing so, introducing the StandardShaderLib to gpu and the first 2 shaders
2015-06-22 14:06:14 +02:00
Brad Davis
cc6b589ae5
Merge remote-tracking branch 'upstream/master' into overlay
2015-06-19 14:48:38 -07:00
Sam Gateau
5a2d2485c0
Fix the cookie cutter problem in stereo, the alphaThreshold wasn 't assigned correctly for opaque
2015-06-19 16:30:48 +02:00
Brad Davis
9bef5f011b
Reverting mirror functionality
2015-06-19 00:03:46 -07:00
Brad Davis
48b27acc79
Merge remote-tracking branch 'upstream/master' into overlay
...
Conflicts:
interface/src/Application.cpp
interface/src/ui/ApplicationOverlay.cpp
2015-06-18 18:17:59 -07:00
Brad Davis
8e5da5acaa
Fix debug compile error
2015-06-18 17:05:49 -07:00
Seth Alves
021dc64789
merge from upstream
2015-06-18 15:03:09 -07:00
Brad Davis
0cdee2d6ec
preprocessor error on Linux/Mac
2015-06-18 12:14:55 -07:00
Seth Alves
b258aeaa3d
merge from master
2015-06-18 10:04:14 -07:00
Atlante45
e8e1f81880
Make Batch copy constructor explicit
2015-06-18 15:22:48 +02:00
Atlante45
a486ed1a57
Add _glUniform1i to Batches
2015-06-18 15:22:48 +02:00
Brad Davis
5c4fa77acd
Merge branch 'temp' into overlay
2015-06-18 00:59:31 -07:00
Brad Davis
d9452cfd2e
Merge branch 'gpu-error-tweak' into overlay
2015-06-18 00:54:48 -07:00
Brad Davis
dfea571e62
Removing a 'using namespace' from a header and tweaking error checking code
2015-06-18 00:54:35 -07:00
Bradley Austin Davis
1705eb8f80
Reverting some changes, putting overlay rendering in its own state manager
2015-06-17 16:08:19 -07:00
Brad Davis
c8cc3a46b3
Merge remote-tracking branch 'origin/fix-gl-matrix' into overlay
2015-06-17 15:13:35 -07:00
Bradley Austin Davis
a27e06713b
Preserve the GL matrix stack when running batch commands
2015-06-17 14:57:14 -07:00
Brad Davis
4282c044ef
Working on mirror and overlay
2015-06-17 12:01:39 -07:00
Brad Davis
5ded9e7eb9
Merge remote-tracking branch 'upstream/master' into overlay
2015-06-17 10:50:01 -07:00
ZappoMan
af5a910f58
Merge branch 'master' of https://github.com/highfidelity/hifi into atmosphereBatchFix
2015-06-17 09:36:16 -07:00
samcake
febc3333cd
Solving the rendering of textured overlay3d
2015-06-17 16:50:35 +02:00
ZappoMan
569971582d
more hacking on trying to port atmospheres to the new pipeline
2015-06-16 18:39:35 -07:00
Seth Alves
508ae276c6
enable -Wdouble-promotion
2015-06-16 18:23:10 -07:00
ZappoMan
167e7d1377
first cut at atmospheres in batch (doesn't work)
2015-06-16 14:05:14 -07:00
Brad Davis
49f4ab99df
Revert "Revert "Fix broken identity transforms on OSX""
...
This reverts commit 1feceec0c7
2015-06-13 10:03:10 -07:00
ZappoMan
1feceec0c7
Revert "Fix broken identity transforms on OSX"
...
This reverts commit 9262839564
2015-06-12 12:57:37 -07:00
Bradley Austin Davis
9262839564
Fix broken identity transforms on OSX
2015-06-12 10:33:52 -07:00
Sam Gateau
7de4c2eff7
first take on the materialKey
2015-06-09 12:17:10 -07:00
samcake
5e351c0328
FIxing the transparent rendering on Mac
2015-06-08 18:36:12 +02:00
samcake
1bff9a17e1
Fixing compilation issues and shader issues on Mac, not fully fixing the transparency though
2015-06-08 17:05:28 +02:00
Sam Gateau
8a93db6f5a
more typos and issues on mac
2015-06-08 07:25:32 -07:00
Sam Gateau
862d6abd79
Typo on mac build
2015-06-08 06:57:04 -07:00
Sam Gateau
b7d88e2642
add apotential fix to the issue with viewInverse for Legacy transform path support
2015-06-08 06:46:45 -07:00
Sam Gateau
5e04b399d8
fixing the wrong matrix used
2015-06-08 03:07:17 -07:00
Sam Gateau
de61f4ea0b
Gettting th ehighlight on transparent to work
2015-06-08 02:52:13 -07:00
Sam Gateau
8d3a3221b0
shuffling the rendering steps to get to render transparent and light it correctly
2015-06-06 09:50:56 -07:00
Atlante45
e421485908
Add glLineWidth to Batch/GLBackend
2015-06-04 10:54:13 +02:00
Sam Gateau
c8e30ef39e
On to a full rendered pipeline
2015-06-01 12:35:54 -07:00
Sam Gateau
4c817547b7
Merging with Brad's branch and trying to get the rendering working
2015-05-31 14:02:20 -07:00
Atlante45
0770f88606
Add glTexParamteri to GLBackend/Batch
2015-05-29 16:50:11 +02:00
ZappoMan
a0e51469d3
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-05-28 12:36:34 -07:00
Seth Alves
ab86b1d90a
code review
2015-05-28 10:29:23 -07:00
Atlante45
10c2f3f561
More TextRenderer work
2015-05-28 14:51:57 +02: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
Atlante45
5d19431d26
Copy/paste error with useClientState
2015-05-26 20:20:39 +02:00
Atlante45
76fc59675b
Merge branch 'team-teaching' into text-renderer
2015-05-26 20:01:26 +02:00
Atlante45
526ec3d489
Move #if #else #endif for convenience
...
This is a convenience change. The double '{' created by the #else messes
up Xcode autoindentation.
It won't that way and the fact that useClientState is a const set to
false when SUPPORT_LEGACY_OPENGL, the code inside the if should still
get optimised out by the compiler.
2015-05-25 11:45:16 +02:00
Ryan Huffman
bffcfa2ab8
Add cache sync flag in Context::enqueueBatch
2015-05-22 15:34:05 -07:00
Ryan Huffman
d1a5662ca7
Merge branch 'team-teaching' of github.com:highfidelity/hifi into ctx
...
Conflicts:
libraries/entities-renderer/src/EntityTreeRenderer.cpp
2015-05-22 15:33:40 -07:00
Atlante45
e691a03c97
Remove push/popInputState
2015-05-22 20:30:54 +02:00
Atlante45
20ff43e29a
Don't sync by default
2015-05-22 20:29:25 +02:00
Ryan Huffman
4a4c9c75fc
Add gpu::context to RenderArgs and start using RenderArgs in place of the flags
2015-05-22 09:50:51 -07:00
Atlante45
e5aa696dda
syncInputStateCache
2015-05-22 17:39:08 +02:00
Atlante45
6b9f9a32bb
Merge branch 'yellow' of http://github.com/samcake/hifi into simple_program
2015-05-21 20:58:42 +02:00
Sam Gateau
3ec6ada29d
Introduce an official syncCache on the GLBackend to catch up with the glCOntext ttrue state
2015-05-19 00:32:36 -07:00
Atlante45
16e6f76028
Improve init/killInput
...
Added glPush/PopClientAttrib() calls
Overrites _input._attributeActivation with the correct values
2015-05-18 15:47:57 +02:00
Atlante45
ede94e4248
Merge branch 'master' of https://github.com/highfidelity/hifi into remove_gl_transform
2015-05-18 11:39:17 +02:00
Atlante45
4bbc5de39d
Remove "raw" gl calls
...
Removed calls to batch._gl*
Added init/killInput in glBackend ctor/dtor
This will disable client states and set buffers to 0
2015-05-17 11:58:39 +02: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
