David Rowe ffeb37e7aa Merge remote-tracking branch 'hifi/master' into merge-hifi-master ... # Conflicts: # CMakeLists.txt # README.md # cmake/externals/glad32es/CMakeLists.txt # cmake/externals/glad41/CMakeLists.txt # cmake/externals/glad45/CMakeLists.txt # cmake/externals/polyvox/CMakeLists.txt # cmake/externals/quazip/CMakeLists.txt # cmake/externals/vhacd/CMakeLists.txt # cmake/init.cmake # cmake/ports/hifi-deps/CONTROL # cmake/ports/sdl2/CONTROL # cmake/ports/sdl2/disable-hidapi-for-uwp.patch # cmake/ports/sdl2/enable-winrt-cmake.patch # cmake/ports/sdl2/fix-arm64-headers.patch # cmake/ports/sdl2/fix-x86-windows.patch # cmake/ports/sdl2/portfile.cmake # cmake/ports/sdl2/vcpkg-cmake-wrapper.cmake # cmake/ports/tbb/portfile.cmake # hifi_vcpkg.py # interface/src/avatar/MyAvatar.h # libraries/avatars-renderer/src/avatars-renderer/Avatar.h # libraries/avatars/src/AvatarData.h # libraries/entities-renderer/src/RenderableEntityItem.h # libraries/entities/src/EntityItem.cpp # libraries/entities/src/EntityItem.h # libraries/fbx/src/GLTFSerializer.cpp # libraries/graphics-scripting/src/graphics-scripting/Forward.h # libraries/networking/src/AddressManager.cpp # libraries/networking/src/DomainHandler.h # libraries/procedural/src/procedural/ProceduralMaterialCache.cpp # libraries/render-utils/src/HighlightEffect.cpp # libraries/render-utils/src/MeshPartPayload.cpp # libraries/render-utils/src/Model.cpp # libraries/render-utils/src/RenderShadowTask.cpp # libraries/script-engine/src/WebSocketClass.cpp		2020-04-09 16:46:27 +12:00
..
render-utils	merge with master	2019-09-05 00:46:56 -07:00
text	Qt 5.13 warnings & fixes	2019-10-08 15:40:13 -07:00
AbstractViewStateInterface.cpp
AbstractViewStateInterface.h
AmbientOcclusionEffect.cpp
AmbientOcclusionEffect.h
AnimDebugDraw.cpp	allow drawing DebugDraw spheres with a specific size	2019-09-17 09:43:19 -07:00
AnimDebugDraw.h
animdebugdraw.slf
animdebugdraw.slv
AntialiasingEffect.cpp	Exposing the AA mode of the AA job	2019-08-20 18:15:35 -07:00
AntialiasingEffect.h	REverting the change in the jittering sequence length	2019-09-03 17:01:03 -07:00
AssembleLightingStageTask.cpp
AssembleLightingStageTask.h
BackgroundStage.cpp	haze on most entities, working on skybox	2019-07-10 23:52:50 -07:00
BackgroundStage.h	haze on most entities, working on skybox	2019-07-10 23:52:50 -07:00
Blendshape.slh
BloomApply.shared.slh
BloomApply.slf
BloomEffect.cpp	propagating the Bloom on off correctly and fixing the problem where Luci prevents from seeing the zone and finally, update the luci.js with the newer version	2019-09-03 16:28:32 -07:00
BloomEffect.h	propagating the Bloom on off correctly and fixing the problem where Luci prevents from seeing the zone and finally, update the luci.js with the newer version	2019-09-03 16:28:32 -07:00
BloomStage.cpp
BloomStage.h
BloomThreshold.shared.slh
BloomThreshold.slf
CauterizedMeshPartPayload.cpp	in the middle of something	2019-10-10 17:09:54 -07:00
CauterizedMeshPartPayload.h	in the middle of something	2019-10-10 17:09:54 -07:00
CauterizedModel.cpp	Merge branch 'master' into instancing	2019-11-05 10:22:24 -08:00
CauterizedModel.h	Clening up left over comments and typos, simplify the code to update Matrices in the model classes and removed renderITemsIdMap because not needed, chasing the problem of the physics objects transform	2019-10-18 03:31:06 -07:00
debug_deferred_buffer.slf
debug_deferred_buffer.slv
debug_deferred_buffer_shared.slh
DebugDeferredBuffer.cpp
DebugDeferredBuffer.h
DefaultMaterials.slh
deferred_light.slv
deferred_light_limited.slv
deferred_light_point.slv
deferred_light_spot.slv
DeferredBuffer.slh
DeferredBufferRead.slh
DeferredBufferWrite.slh	render opaque PolyLines with opaque pipepline	2019-08-22 08:13:11 -07:00
DeferredFramebuffer.cpp
DeferredFramebuffer.h
DeferredFrameTransform.cpp
DeferredFrameTransform.h
DeferredLighting.slh
DeferredLightingEffect.cpp	changes from cr	2019-07-29 18:25:36 -07:00
DeferredLightingEffect.h
DeferredTransform.slh
directional_skybox_light.slf	condense direction light shaders using slp defines	2019-07-16 11:24:19 -07:00
DrawHaze.cpp	haze on most entities, working on skybox	2019-07-10 23:52:50 -07:00
DrawHaze.h
drawWorkloadProxy.slf
drawWorkloadProxy.slv
drawWorkloadView.slf
drawWorkloadView.slv
Fade.slh
Fade_shared.slh
FadeEffect.cpp
FadeEffect.h
FadeEffectJobs.cpp
FadeEffectJobs.h
FadeObjectParams.shared.slh
FboCache.cpp
FboCache.h
FramebufferCache.cpp	BUGZ-987: fix depth testing of HUD layer 3D objects	2019-07-23 12:09:12 -07:00
FramebufferCache.h
fxaa.slf
fxaa.slv
fxaa_blend.slf
GeometryCache.cpp	material entities support cullFaceMode and support gltf doubleSided	2019-12-12 23:01:57 -05:00
GeometryCache.h	material entities support cullFaceMode and support gltf doubleSided	2019-12-12 23:01:57 -05:00
GlobalLight.slh	haze on most entities, working on skybox	2019-07-10 23:52:50 -07:00
grid.slf	merge with master	2019-07-03 17:58:23 -07:00
Haze.slf	add haze to skybox	2019-07-11 11:00:30 -07:00
HazeStage.cpp
HazeStage.h
Highlight.slf
Highlight.slh
Highlight_aabox.slv
Highlight_filled.slf
Highlight_shared.slh
HighlightEffect.cpp	Fix crash when highlighting custom pipeline shapes	2019-11-08 11:18:02 -08:00
HighlightEffect.h
hmd_ui.slf	fixed ui flipping issue	2019-07-01 10:52:03 -07:00
hmd_ui.slv
LightAmbient.slh
LightClusterGrid.slh
LightClusterGrid_shared.slh
LightClusters.cpp
LightClusters.h
lightClusters_drawClusterContent.slf
lightClusters_drawClusterContent.slv
lightClusters_drawClusterFromDepth.slf
lightClusters_drawClusterFromDepth.slv
lightClusters_drawGrid.slf
lightClusters_drawGrid.slv
LightDirectional.slh
LightingModel.cpp
LightingModel.h
LightingModel.slh
LightLocal.slh
LightPayload.cpp
LightPayload.h
LightPoint.slh
LightSpot.slh
LightStage.cpp	mostly working equation?	2019-07-09 13:34:33 -07:00
LightStage.h	mostly working equation?	2019-07-09 13:34:33 -07:00
local_lights_drawOutline.slf
local_lights_shading.slf
MeshDeformer.slh
MeshPartPayload.cpp	Merge remote-tracking branch 'hifi/master' into merge-hifi-master	2020-04-09 16:46:27 +12:00
MeshPartPayload.h	Made Sam's graphics patches work with 86 K2.	2019-12-13 02:38:14 -05:00
MetaModelPayload.cpp
MetaModelPayload.h
Model.cpp	Merge pull request #16548 from HifiExperiments/visible	2019-12-13 13:20:15 -08:00
Model.h	trying and failing to fix models	2019-12-12 23:04:47 -05:00
model.slf	put back stepping in translucent case	2019-12-12 23:01:57 -05:00
model.slv
nop.slf
parabola.slf
parabola.slv
PickItemsJob.cpp
PickItemsJob.h
RenderCommonTask.cpp	fix android/mac build error	2019-07-30 13:15:26 -07:00
RenderCommonTask.h	fix android/mac build error	2019-07-30 13:15:26 -07:00
RenderDeferredTask.cpp	propagating the Bloom on off correctly and fixing the problem where Luci prevents from seeing the zone and finally, update the luci.js with the newer version	2019-09-03 16:28:32 -07:00
RenderDeferredTask.h
RenderForwardTask.cpp	Addressing review comments	2019-08-14 10:28:42 -07:00
RenderForwardTask.h	Addressing review comments	2019-08-14 10:28:42 -07:00
RenderHifi.h
RenderHUDLayerTask.cpp	haze on most entities, working on skybox	2019-07-10 23:52:50 -07:00
RenderHUDLayerTask.h	haze on most entities, working on skybox	2019-07-10 23:52:50 -07:00
RenderPipelines.cpp	material entities support cullFaceMode and support gltf doubleSided	2019-12-12 23:01:57 -05:00
RenderPipelines.h
RenderShadowTask.cpp	fix shadows!!	2019-12-12 23:04:55 -05:00
RenderShadowTask.h	mostly working equation?	2019-07-09 13:34:33 -07:00
RenderUtilsLogging.cpp
RenderUtilsLogging.h
RenderViewTask.cpp
RenderViewTask.h
sdf_text3D.slf	supporting text effects + fonts on text entities	2019-07-30 09:59:45 -07:00
sdf_text3D.slh	supporting text effects + fonts on text entities	2019-07-30 09:59:45 -07:00
sdf_text3D.slv	try to fix android shader build error	2019-08-01 21:29:01 -07:00
ShadingModel.slh
Shadow.slh
ShadowCore.slh
Shadows_shared.slh
simple.slf	haze on most entities, working on skybox	2019-07-10 23:52:50 -07:00
simple.slv
simple_procedural.slf	wip adding haze to forward rendering	2019-07-09 00:46:24 -07:00
simple_procedural.slv	procedural vertex shaders	2019-12-12 22:49:48 -05:00
Skinning.slh
SoftAttachmentModel.cpp	Fix code style / remove cruft	2019-11-13 12:50:13 -08:00
SoftAttachmentModel.h
ssao.slh
ssao_bilateralBlur.slf
ssao_bilateralBlur.slv
ssao_buildNormals.slf
ssao_debugOcclusion.slf
ssao_gather.slf	possible fix for shader compilation error	2019-07-12 16:22:01 -07:00
ssao_makeOcclusion.slf
ssao_makePyramid.slf
ssao_mip_depth.slf
ssao_shared.h
standardDrawTexture.slf
standardDrawTextureNoBlend.slf
standardTransformPNTC.slv
stencil_drawMask.slf
StencilMaskPass.cpp
StencilMaskPass.h
SubsurfaceScattering.cpp
SubsurfaceScattering.h
SubsurfaceScattering.slh
subsurfaceScattering_drawScattering.slf
subsurfaceScattering_makeLUT.slf
subsurfaceScattering_makeProfile.slf
subsurfaceScattering_makeSpecularBeckmann.slf
SurfaceGeometry.slh
surfaceGeometry_copyDepth.slf
surfaceGeometry_downsampleDepthNormal.slf
surfaceGeometry_makeCurvature.slf
surfaceGeometry_makeLinearDepth.slf
SurfaceGeometryPass.cpp
SurfaceGeometryPass.h
taa.slf
taa.slh
taa_blend.slf
TextRenderer3D.cpp	supporting text effects + fonts on text entities	2019-07-30 09:59:45 -07:00
TextRenderer3D.h	supporting text effects + fonts on text entities	2019-07-30 09:59:45 -07:00
TextureCache.h
ToneMapAndResampleTask.cpp	made color format for resolve FB a parameter, reverted name of tonemapping task to preserve back compatibility	2019-07-30 11:57:01 -07:00
ToneMapAndResampleTask.h	cleaning up	2019-07-30 10:08:38 -07:00
toneMapping.slf	broken on android again somehow	2019-07-29 13:45:08 -07:00
UpdateSceneTask.cpp
UpdateSceneTask.h
velocityBuffer_cameraMotion.slf
VelocityBufferPass.cpp
VelocityBufferPass.h
web_browser.slf	fix haze on web entities, deferred and forward	2019-07-11 14:56:17 -07:00
web_browser.slv	fix haze on web entities, deferred and forward	2019-07-11 14:56:17 -07:00
WorkloadResource.slh
zone_draw.slh
zone_drawAmbient.slf
zone_drawKeyLight.slf
zone_drawSkybox.slf
ZoneRenderer.cpp
ZoneRenderer.h