overte-HifiExperiments/libraries/render-utils/src
Brad Davis 5744200f64 Merge remote-tracking branch 'upstream/master' into plugins
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/avatar/MyAvatar.h
2015-07-20 19:21:02 -07:00
..
text Removing GL headers from most files, and some naked GL from application.cpp 2015-07-18 00:46:09 -07:00
AbstractViewStateInterface.cpp
AbstractViewStateInterface.h Merge branch 'master' into plugins 2015-07-20 13:33:24 -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
deferred_light_limited.slv Dead code and disable debug info 2015-07-09 09:37:35 -07:00
deferred_light_spot.slv FInally getting a nice spot light volume working for all angles 2015-07-09 03:45:19 -07:00
DeferredBuffer.slh
DeferredBufferWrite.slh
DeferredGlobalLight.slh
DeferredLighting.slh
DeferredLightingEffect.cpp Removing GL headers from most files, and some naked GL from application.cpp 2015-07-18 00:46:09 -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
directional_ambient_light_cascaded_shadow_map.slf
directional_ambient_light_shadow_map.slf
directional_light.slf
directional_light_cascaded_shadow_map.slf
directional_light_shadow_map.slf
directional_skybox_light.slf
directional_skybox_light_cascaded_shadow_map.slf
directional_skybox_light_shadow_map.slf
Environment.cpp Working on cleaning up diff 2015-07-17 11:02:32 -07:00
Environment.h resolve conflicts on merge with upstream/master 2015-07-20 12:29:38 -07:00
FboCache.cpp
FboCache.h
GeometryCache.cpp Removing GL headers from most files, and some naked GL from application.cpp 2015-07-18 00:46:09 -07:00
GeometryCache.h Removing GL headers from most files, and some naked GL from application.cpp 2015-07-18 00:46:09 -07:00
GlWindow.cpp Working on mac functionality 2015-07-02 18:14:12 -07:00
GlWindow.h Working on cleaning up diff 2015-07-17 11:02:32 -07:00
JointState.cpp
JointState.h Render a different model when in first person view. 2015-06-24 16:10:47 -07:00
Model.cpp Removing GL headers from most files, and some naked GL from application.cpp 2015-07-18 00:46:09 -07:00
Model.h Removing GL headers from most files, and some naked GL from application.cpp 2015-07-18 00:46:09 -07:00
model.slf
model.slv fixing the wrong matrix used 2015-06-08 03:07:17 -07:00
model_lightmap.slf
model_lightmap.slv
model_lightmap_normal_map.slf
model_lightmap_normal_map.slv
model_lightmap_normal_specular_map.slf
model_lightmap_specular_map.slf
model_normal_map.slf
model_normal_map.slv Fixing compilation issues and shader issues on Mac, not fully fixing the transparency though 2015-06-08 17:05:28 +02:00
model_normal_specular_map.slf
model_shadow.slf
model_shadow.slv
model_specular_map.slf
model_translucent.slf FIxing the transparent rendering on Mac 2015-06-08 18:36:12 +02:00
OffscreenGlCanvas.cpp Merge branch 'master' into plugins 2015-07-20 13:33:24 -07:00
OffscreenGlCanvas.h Merge branch 'master' into plugins 2015-07-20 13:33:24 -07:00
OffscreenQmlSurface.cpp Merge branch 'master' into plugins 2015-07-20 13:33:24 -07:00
OffscreenQmlSurface.h Merge branch 'master' into plugins 2015-07-20 13:33:24 -07:00
OglplusHelpers.cpp Working on mac functionality 2015-07-02 18:14:12 -07:00
OglplusHelpers.h Working on mac functionality 2015-07-02 18:14:12 -07:00
overlay3D.slf polish before PR 2015-06-17 17:09:33 +02:00
overlay3D.slv Solving the rendering of textured overlay3d 2015-06-17 16:50:35 +02:00
PhysicsEntity.cpp
PhysicsEntity.h
point_light.slf
RenderDeferredTask.cpp Removing GL headers from most files, and some naked GL from application.cpp 2015-07-18 00:46:09 -07:00
RenderDeferredTask.h First take oon the query for the gpu 2015-07-08 10:00:58 -07:00
RenderUtil.cpp Removing GL headers from most files, and some naked GL from application.cpp 2015-07-18 00:46:09 -07:00
RenderUtil.h removed dead code 2015-07-14 18:09:58 -07:00
RenderUtilsLogging.cpp
RenderUtilsLogging.h
sdf_text3D.slf Improve batched font rendering smoothing 2015-07-09 14:34:33 -07:00
sdf_text3D.slv Transmit normal to text rendering shader 2015-06-18 15:23:52 +02:00
Shadow.slh
simple.slf
simple.slv
simple_textured.slf
simple_textured_emisive.slf Introduce new emissive simple program 2015-06-26 16:17:41 -07:00
skin_model.slv Fixing the skinning issue 2015-06-08 11:22:16 -07:00
skin_model_normal_map.slv shuffling the rendering steps to get to render transparent and light it correctly 2015-06-06 09:50:56 -07:00
skin_model_shadow.slv
SkyFromAtmosphere.slf CR feedback 2015-06-17 09:59:38 -07:00
SkyFromAtmosphere.slv cleanup 2015-06-17 09:23:12 -07:00
SkyFromSpace.slf CR feedback 2015-06-17 09:59:38 -07:00
SkyFromSpace.slv cleanup 2015-06-17 09:23:12 -07:00
spot_light.slf Dead code and disable debug info 2015-07-09 09:37:35 -07:00
standardDrawTexture.slf Revert "Revert "Merge pull request #5106 from jherico/render_cursor"" 2015-06-13 10:02:54 -07:00
standardTransformPNTC.slv Prep work for procedural stars & stuff 2015-06-22 09:43:12 -07:00
stars.slf Removing starfield tilt and reducing grid alpha 2015-07-20 11:40:12 -07:00
TextRenderer3D.cpp Removing GL headers from most files, and some naked GL from application.cpp 2015-07-18 00:46:09 -07:00
TextRenderer3D.h Working on text rendering overlays 2015-07-16 15:56:01 -07:00
TextureCache.cpp Removing GL headers from most files, and some naked GL from application.cpp 2015-07-18 00:46:09 -07:00
TextureCache.h Removing GL headers from most files, and some naked GL from application.cpp 2015-07-18 00:46:09 -07:00