Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-10 13:58:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte/libraries/render-utils/src
History
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
..
text Merge remote-tracking branch 'upstream/master' into core 2015-08-01 20:01:59 -07:00
AbstractViewStateInterface.cpp Attempting to fix threading issues with web entities 2015-05-13 14:00:41 -07:00
AbstractViewStateInterface.h merging my changes to remove cruff from application to AUstin;s latest 2015-07-20 15:37:17 -07:00
ambient_occlusion.slf Core profile shader work and test code 2015-08-01 14:43:52 -07:00
ambient_occlusion.slv Core profile shader work and test code 2015-08-01 14:43:52 -07:00
AmbientOcclusionEffect.cpp Merge with master 2015-07-30 11:20:00 -07:00
AmbientOcclusionEffect.h Coding standard and tab fixes 2015-07-27 12:14:29 -07:00
AnimationHandle.cpp Conditionnal fixes. 2015-07-10 15:36:17 -07:00
AnimationHandle.h Made Animations safe for resource reload 2015-07-10 12:01:51 -07:00
deferred_light.slv Working on GL 4 2015-06-23 09:48:16 -07:00
deferred_light_limited.slv Core profile shader work and test code 2015-08-01 14:43:52 -07:00
deferred_light_spot.slv Core profile shader work and test code 2015-08-01 14:43:52 -07:00
DeferredBuffer.slh Core profile shader work and test code 2015-08-01 14:43:52 -07:00
DeferredBufferWrite.slh Merge branch 'master' into gl4_1 2015-07-31 15:08:37 -07:00
DeferredGlobalLight.slh Core profile shader work and test code 2015-08-01 14:43:52 -07:00
DeferredLighting.slh Clean up comments 2015-02-09 18:02:34 -08:00
DeferredLightingEffect.cpp FIxed the problem on Mac, by removing all of the gpuConfig includesgit status 2015-07-30 18:27:47 -07:00
DeferredLightingEffect.h Removing GL headers from most files, and some naked GL from application.cpp 2015-07-18 00:46:09 -07:00
directional_ambient_light.slf Working on GL 4 2015-06-23 09:48:16 -07:00
directional_ambient_light_cascaded_shadow_map.slf Working on GL 4 2015-06-23 09:48:16 -07:00
directional_ambient_light_shadow_map.slf Working on GL 4 2015-06-23 09:48:16 -07:00
directional_light.slf Working on GL 4 2015-06-23 09:48:16 -07:00
directional_light_cascaded_shadow_map.slf Working on GL 4 2015-06-23 09:48:16 -07:00
directional_light_shadow_map.slf Working on GL 4 2015-06-23 09:48:16 -07:00
directional_skybox_light.slf Working on GL 4 2015-06-23 09:48:16 -07:00
directional_skybox_light_cascaded_shadow_map.slf Working on GL 4 2015-06-23 09:48:16 -07:00
directional_skybox_light_shadow_map.slf Working on GL 4 2015-06-23 09:48:16 -07:00
Environment.cpp Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-20 14:50:44 -07:00
Environment.h resolve conflicts on merge with upstream/master 2015-07-20 12:29:38 -07:00
FboCache.cpp Fixing scale resolution issues 2015-05-07 12:01:56 -07:00
FboCache.h Fixing scale resolution issues 2015-05-07 12:01:56 -07:00
FramebufferCache.cpp 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
FramebufferCache.h 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
gaussian_blur.slf Core profile shader work and test code 2015-08-01 14:43:52 -07:00
gaussian_blur_horizontal.slv Core profile shader work and test code 2015-08-01 14:43:52 -07:00
gaussian_blur_vertical.slv Core profile shader work and test code 2015-08-01 14:43:52 -07:00
GeometryCache.cpp diff redux 2015-08-01 16:53:35 -07:00
GeometryCache.h use Austins QUAD to TRIANGLE_STRIP approach 2015-08-01 16:50:36 -07:00
GlWindow.cpp CR comments 2015-05-29 12:45:03 -07:00
GlWindow.h CR comments 2015-05-29 12:45:03 -07:00
hit_effect.slf Core profile shader work and test code 2015-08-01 14:43:52 -07:00
hit_effect.slv Core profile shader work and test code 2015-08-01 14:43:52 -07:00
HitEffect.cpp removed synccache line 2015-07-29 11:15:20 -07:00
HitEffect.h fixed merge conflicts and refactored hit effect to catch up with refactored rendering engine 2015-07-29 10:02:06 -07:00
JointState.cpp quiet compiler, remove some trailing control-Ms 2015-04-25 09:20:00 -07:00
JointState.h Render a different model when in first person view. 2015-06-24 16:10:47 -07:00
Model.cpp Core profile shader work and test code 2015-08-01 14:43:52 -07:00
Model.h remove non-batch versions of GeometryCache renderXYZ() methods 2015-07-23 07:42:58 -07:00
model.slf Core profile shader work and test code 2015-08-01 14:43:52 -07:00
model.slv Still working on GL update 2015-06-23 09:49:10 -07:00
model_lightmap.slf Still working on GL update 2015-06-23 09:49:10 -07:00
model_lightmap.slv Still working on GL update 2015-06-23 09:49:10 -07:00
model_lightmap_normal_map.slf Still working on GL update 2015-06-23 09:49:10 -07:00
model_lightmap_normal_map.slv Still working on GL update 2015-06-23 09:49:10 -07:00
model_lightmap_normal_specular_map.slf Still working on GL update 2015-06-23 09:49:10 -07:00
model_lightmap_specular_map.slf Still working on GL update 2015-06-23 09:49:10 -07:00
model_normal_map.slf Core profile shader work and test code 2015-08-01 14:43:52 -07:00
model_normal_map.slv Still working on GL update 2015-06-23 09:49:10 -07:00
model_normal_specular_map.slf Core profile shader work and test code 2015-08-01 14:43:52 -07:00
model_shadow.slf Still working on GL update 2015-06-23 09:49:10 -07:00
model_shadow.slv Still working on GL update 2015-06-23 09:49:10 -07:00
model_specular_map.slf Still working on GL update 2015-06-23 09:49:10 -07:00
model_translucent.slf Still working on GL update 2015-06-23 09:49:10 -07:00
occlusion_blend.slf Core profile shader work and test code 2015-08-01 14:43:52 -07:00
OffscreenGlCanvas.cpp Removing GL headers from most files, and some naked GL from application.cpp 2015-07-18 00:46:09 -07:00
OffscreenGlCanvas.h Removing GL headers from most files, and some naked GL from application.cpp 2015-07-18 00:46:09 -07:00
OffscreenQmlSurface.cpp Limit the amount of time consumed by rendering QML 2015-07-25 11:40:58 -04:00
OffscreenQmlSurface.h Limit the amount of time consumed by rendering QML 2015-07-25 11:40:58 -04:00
OglplusHelpers.cpp Use make_shared/create to make shared pointers 2015-07-01 19:46:06 -07:00
OglplusHelpers.h first cut and removing openGl dependency in shared 2015-06-18 09:30:34 -07:00
overlay3D.slf Core profile shader work and test code 2015-08-01 14:43:52 -07:00
overlay3D.slv Core profile shader work and test code 2015-08-01 14:43:52 -07:00
PhysicsEntity.cpp move PhysicsEntity so that ModelEntityItem can initiate a model download 2015-03-11 18:34:27 -07:00
PhysicsEntity.h move PhysicsEntity so that ModelEntityItem can initiate a model download 2015-03-11 18:34:27 -07:00
point_light.slf Still working on GL update 2015-06-23 09:49:10 -07:00
RenderDeferredTask.cpp Merge with master 2015-07-30 11:20:00 -07:00
RenderDeferredTask.h fixed merge conflicts and refactored hit effect to catch up with refactored rendering engine 2015-07-29 10:02:06 -07:00
RenderUtilsLogging.cpp fix filenames in comments 2015-04-07 10:03:14 -07:00
RenderUtilsLogging.h logging group for render-utils 2015-04-06 18:16:01 -07:00
sdf_text3D.slf Core profile shader work and test code 2015-08-01 14:43:52 -07:00
sdf_text3D.slv Core profile shader work and test code 2015-08-01 14:43:52 -07:00
Shadow.slh Core profile shader work and test code 2015-08-01 14:43:52 -07:00
simple.slf Merge branch 'master' into gl4_1 2015-07-31 15:08:37 -07:00
simple.slv more hacking 2015-07-23 14:12:52 -07:00
simple_textured.slf Merge branch 'master' into gl4_1 2015-07-31 15:08:37 -07:00
simple_textured_emisive.slf Core profile shader work and test code 2015-08-01 14:43:52 -07:00
skin_model.slv Core profile shader work and test code 2015-08-01 14:43:52 -07:00
skin_model_normal_map.slv Core profile shader work and test code 2015-08-01 14:43:52 -07:00
skin_model_shadow.slv Core profile shader work and test code 2015-08-01 14:43:52 -07:00
SkyFromAtmosphere.slf Core profile shader work and test code 2015-08-01 14:43:52 -07:00
SkyFromAtmosphere.slv Core profile shader work and test code 2015-08-01 14:43:52 -07:00
SkyFromSpace.slf Core profile shader work and test code 2015-08-01 14:43:52 -07:00
SkyFromSpace.slv Core profile shader work and test code 2015-08-01 14:43:52 -07:00
spot_light.slf Merge branch 'master' into gl4_1 2015-07-31 15:08:37 -07:00
standardDrawTexture.slf Core profile shader work and test code 2015-08-01 14:43:52 -07:00
standardTransformPNTC.slv GL 4 2015-06-25 18:52:34 -07:00
stars.slf Core profile shader work and test code 2015-08-01 14:43:52 -07:00
stars.slv Core profile shader work and test code 2015-08-01 14:43:52 -07:00
starsGrid.slf Core profile shader work and test code 2015-08-01 14:43:52 -07:00
TextRenderer3D.cpp fix a bunch of warnings 2015-07-20 15:12:27 -07:00
TextRenderer3D.h fix a bunch of warnings 2015-07-20 15:12:27 -07:00
TextureCache.cpp compile on linux with GLEW 2015-07-28 17:53:01 -07:00
TextureCache.h Removing code aroung the selfie fremebuffer 2015-07-22 10:57:08 -07:00