Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-14 07:36:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
36338 commits 25 branches 0 tags 1.1 GiB
Commit graph

487 commits

Author SHA1 Message Date
Seiji Emery
5ca8d20251 Merge branch 'master' of https://github.com/highfidelity/hifi into gputest 
Conflicts:
	cmake/modules/Find3DConnexionClient.cmake
	interface/external/connexionclient/readme.txt
	interface/src/devices/3DConnexionClient.cpp
	interface/src/devices/3DConnexionClient.h
 2015-08-05 15:56:06 -07:00
Stephen Birarda
998a8168a3 remove an extra unneeded message 2015-08-05 14:38:14 -07:00
Stephen Birarda
653e0d29c7 resolve conflicts on merge with upstream/core 2015-08-05 14:37:30 -07:00
Stephen Birarda
6c337b8aeb repairs for build type of glew external 2015-08-05 14:30:36 -07:00
Bradley Austin Davis
89cc2ccfa5 More merge comments 2015-08-05 13:53:19 -07:00
Bradley Austin Davis
649b9d6ce9 Fixing signed/unsigned comparisons 2015-08-05 13:48:05 -07:00
Stephen Birarda
cc909507f4 get GLEW for all platforms as external project 2015-08-05 12:34:11 -07:00
Bradley Austin Davis
04d579be7a Removing integrated glew 2015-08-05 11:21:59 -07:00
Sam Gateau
fc0ee28b84 FIx the mirror rendering bugs by replacing the prvious technique by a simple true mirror during the final blit for both rear view mirror and full screen mirror, not working for HMD 2015-08-04 16:31:20 -07:00
Seiji Emery
e5cb9cb862 integrating core-profile work to get opengl 4.1 on mac 2015-08-04 15:18:47 -07:00
Sam Gateau
10fcce7064 FIx again the issue of the COlor 32 format to NUINT8 2015-08-04 14:38:43 -07:00
Sam Gateau
34183b9ddf COmmenting the remove of the glLIneWidth and demoving dead code 2015-08-04 12:36:35 -07:00
Sam Gateau
d07ab353fc remove glLineWidth completely because it s not available anymore for wide lines in core 2015-08-04 11:57:20 -07:00
Bradley Austin Davis
53ccbfc4fa Merge branch 'core' into plugins 2015-08-03 22:25:50 -07:00
Sam Gateau
44e7223547 Fixing the skinning by simply reverting the change to the format for the inSkinIndex 2015-08-03 16:05:04 -07:00
samcake
caa5732e06 Remove completely GL transform legacy support 2015-08-03 14:51:57 -07:00
Sam Gateau
647abe5009 Replace the glCOlor4f by a glVertexAttribute4f on the color slot instead 2015-08-03 13:41:02 -07:00
Sam Gateau
f23df03ea9 REsolve the bracket issue, 2015-08-03 13:10:06 -07:00
samcake
32c253453b REsolving the input 2015-08-03 12:47:51 -07:00
Seiji Emery
4e3cfd7c49 clear empty frame buffer fix 
thanks sam!
 2015-08-03 12:04:02 -07:00
samcake
d3fc05e99f FIxed a few shaders varyings, problem identified on MAC to be solved 2015-08-03 11:18:08 -07:00
Sam Gateau
785fd03085 Merge branch 'core' of https://github.com/highfidelity/hifi into punk 2015-08-03 10:26:06 -07:00
samcake
85077604dc Merge pull request #5478 from jherico/marge 
CORE BRANCH - More shader fixes
 2015-08-03 10:25:33 -07:00
Sam Gateau
1a276924f0 Merging core 2015-08-03 10:05:23 -07:00
Brad Davis
5c07a7d85b Merge remote-tracking branch 'upstream/master' into plugins 2015-08-01 21:58:05 -07:00
Brad Davis
53feaf2ab6 More shader fixes 2015-08-01 20:17:57 -07:00
Bradley Austin Davis
f19653f3e2 Integrate glew 2015-08-01 20:08:19 -07:00
Brad Davis
180f912924 Merge remote-tracking branch 'upstream/master' into core 
Conflicts:
	interface/src/ui/overlays/Circle3DOverlay.cpp
	libraries/gpu/src/gpu/Format.h
	libraries/render-utils/src/GeometryCache.cpp
	libraries/render-utils/src/Model.cpp
	libraries/render-utils/src/text/Font.cpp
 2015-08-01 20:01:59 -07:00
ZappoMan
493836e363 remove QUADS from GLBackendShared and Format 2015-08-01 17:26:38 -07:00
Brad Davis
b84eef93c9 Core profile shader work and test code 2015-08-01 14:43:52 -07:00
ZappoMan
1dd6c1117d change GeometryCache::renderQuad() to use TRIANGLES as lower level render primitive 2015-08-01 11:29:28 -07:00
Sam Gateau
6a8faca0ee Install the GLCore way of doing input without all the legacy stuff 2015-07-31 22:46:06 -07:00
Sam Gateau
ca4dbdb996 Merging with upstream and compiling on windows 2015-07-31 16:14:53 -07:00
Brad Davis
aea07fe671 Merge branch 'master' into gl4_1 
Conflicts:
	libraries/gpu/src/gpu/Config.slh
	libraries/render-utils/src/deferred_light_limited.slv
	libraries/render-utils/src/simple.slf
	libraries/render-utils/src/simple_textured.slf
	tests/render-utils/src/main.cpp
	tools/scribe/src/main.cpp
 2015-07-31 15:08:37 -07:00
Brad Davis
155f88e267 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/devices/OculusManager.cpp
	interface/src/devices/TV3DManager.cpp
	interface/src/devices/TV3DManager.h
	libraries/gpu/src/gpu/GPUConfig.h
 2015-07-31 10:28:06 -07:00
samcake
fbf21cb089 FIxed the problem on Mac, by removing all of the gpuConfig includesgit status 
q
:q
wq
 2015-07-30 18:27:47 -07:00
Sam Gateau
14f4c9c6c0 REmove more of the unnecessary GLBacken .h and GPUCOnfig.h include, The gpu::Context is now completely agnostic of the True Backend 2015-07-30 15:07:36 -07:00
Brad Davis
f7a2513f26 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Menu.cpp
	interface/src/Menu.h
	interface/src/avatar/MyAvatar.h
	tests/ui/src/main.cpp
 2015-07-30 12:55:22 -07:00
Sam Gateau
d84e2d31ea Merge with master 2015-07-30 11:20:00 -07:00
Seth Alves
a9556660c4 fix linux build 2015-07-29 20:53:24 -07:00
samcake
70d64a7777 Really fixing the depth write mask issue on clear... 2015-07-29 18:27:10 -07:00
samcake
e32e45ed2b make sure the writting mask is on for depth buffer 2015-07-29 18:06:46 -07:00
Sam Gateau
4972cb024f Try to make the inlucde sequence simpler in gpu for GLBackend 2015-07-29 16:48:23 -07:00
Sam Gateau
269db0ff6f fixing the stars rendering that was vilently broken durign the hunt for GPUCOnfig.h includes 2015-07-29 16:08:16 -07:00
Sam Gateau
3c934af297 clean the gpuCOnfig.h for linux 2015-07-29 14:45:48 -07:00
Sam Gateau
9601e09ba9 A simpler way to add the NSIGHT_FOUND define to all the projects depending on GPU 2015-07-29 14:42:24 -07:00
Sam Gateau
661f29924f Clean up the cmakelist to normally onlly do th eminimal linking and include for gl 2015-07-29 13:55:26 -07:00
Andrew Meadows
475d069185 fix rendering on linux 2015-07-28 18:12:10 -07:00
Andrew Meadows
77a12eb50e compile on linux with GLEW 2015-07-28 17:53:01 -07:00
samcake
27d3d3f450 fix w to x 2015-07-28 15:51:15 -07:00
Sam Gateau
8b20f9d3a6 do the minimum include to use glew on linux 2015-07-28 15:48:01 -07:00
Sam Gateau
df9b66d267 Implement the uniform buffer and resource texture cache and their reset 2015-07-28 15:08:52 -07:00
Sam Gateau
f525a8a245 Removing all the unecessary calls of Batch from the gl legacy time 2015-07-27 17:17:56 -07:00
Sam Gateau
a5ad40bee9 INtroduce the resetStage command to clear up all cache and state in the gpu::Conference and make sure no more resource are linked 2015-07-27 14:07:28 -07:00
Bradley Austin Davis
3c6416d6b8 Merge branch 'master' into plugins 2015-07-27 10:09:02 -04:00
Bradley Austin Davis
4bdd41c608 Working on ubuntu build 2015-07-27 10:08:20 -04:00
Sam Gateau
776d4747b2 Cleaning up the FBO cache and the output stage in general 2015-07-24 14:47:44 -07:00
Bradley Austin Davis
a60e669d3d Merge branch 'master' into plugins 2015-07-24 13:38:18 -04:00
samcake
e6f2504514 FIx the problem of clear when the color mask is not WRITE_ALL 2015-07-24 09:26:32 -07:00
samcake
52ac5b3ef6 On mac cannot get ther erendering to properly display the overlay if the rear view mirror is active on resize 2015-07-24 03:38:21 -07:00
Sam Gateau
cb375e8ece FIund a nasty bug with the scissor which was the reason for many issues, tried to integrate the framebuffer setup and clear as part of the enginepipeline so calling display side is simpler 2015-07-24 02:15:50 -07:00
Sam Gateau
66cd17ec66 REmove the crappy solution for drawing transparent texture into overlay by a proper shader 2015-07-23 23:09:40 -07:00
Sam Gateau
ded95a3dde removing dead code 2015-07-23 16:58:21 -07:00
Sam Gateau
a424ff98ca Fixing issues with the review process 2015-07-23 16:55:18 -07:00
Sam Gateau
d56b5f39fb strenghening the checks in GLBackend::downloadFramebuffer before actually calling the true glReadPixels 2015-07-23 16:31:11 -07:00
Sam Gateau
be9d99264f Introducing the download Framebuffer call on the context to capture a snapshot 2015-07-23 16:15:10 -07:00
Bradley Austin Davis
901dd77f05 Merge remote-tracking branch 'upstream/master' into plugins 2015-07-23 18:11:25 -04:00
Sam Gateau
dc10f30d3d Merged 2015-07-23 15:10:42 -07:00
Sam Gateau
a561874ce3 Render the rear view mirror in a separate target and then display it during overlay pass 2015-07-23 14:56:14 -07:00
Bradley Austin Davis
1db4162371 Merge branch 'master' into plugins 2015-07-23 13:42:03 -04:00
ZappoMan
bd6534a991 remove deprecated renderBatch() 2015-07-23 08:35:03 -07:00
Sam Gateau
f70553ec95 Fixing merge 2015-07-22 11:31:46 -07:00
Sam Gateau
8dbd991652 USing a modern singleton guard 2015-07-22 10:54:40 -07:00
Sam Gateau
7ac2030862 Preparing for first pr 2015-07-22 10:43:50 -07:00
Bradley Austin Davis
114ab9e47f Merge branch 'master' into plugins 2015-07-22 11:47:56 -04:00
Sam Gateau
7b35048e52 Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-07-21 11:18:15 -07:00
Sam Gateau
93afdf79a3 Removing the gl driver version report intiialization code out of applciation 2015-07-21 11:17:41 -07:00
Bradley Austin Davis
fda1cb6f7b Merge remote-tracking branch 'upstream/master' into marge 2015-07-21 08:59:29 -07:00
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