Merged in NRRPLT-7975-add-missing-gazebo-materials (pull request #40)
[NRRPLT-7975] Add gazebo materials * [NRRPLT-7975] Add gazebo materials * [NRRPLT-7975] add gazebo material * [NRRPLT-7975] Add textures * [NRRPLT-7975] Fix folders Approved-by: Sandro Weber Approved-by: Manos Angelidis
Showing
- gzbridge/OgreMaterialParser.cc 7 additions, 5 deletionsgzbridge/OgreMaterialParser.cc
- http/client/assets/materials/OrangeTransparent.material 0 additions, 22 deletionshttp/client/assets/materials/OrangeTransparent.material
- http/client/assets/materials/black.material 0 additions, 25 deletionshttp/client/assets/materials/black.material
- http/client/assets/materials/blue.material 0 additions, 26 deletionshttp/client/assets/materials/blue.material
- http/client/assets/materials/green.material 0 additions, 26 deletionshttp/client/assets/materials/green.material
- http/client/assets/materials/grey.material 0 additions, 26 deletionshttp/client/assets/materials/grey.material
- http/client/assets/materials/red.material 0 additions, 26 deletionshttp/client/assets/materials/red.material
- http/client/assets/media/materials/programs/CreaseShadingFP.glsl 78 additions, 0 deletions...ient/assets/media/materials/programs/CreaseShadingFP.glsl
- http/client/assets/media/materials/programs/GBufferFP.glsl 45 additions, 0 deletionshttp/client/assets/media/materials/programs/GBufferFP.glsl
- http/client/assets/media/materials/programs/GBufferVP.glsl 48 additions, 0 deletionshttp/client/assets/media/materials/programs/GBufferVP.glsl
- http/client/assets/media/materials/programs/ModulateFP.glsl 39 additions, 0 deletionshttp/client/assets/media/materials/programs/ModulateFP.glsl
- http/client/assets/media/materials/programs/NoFilterFP.glsl 38 additions, 0 deletionshttp/client/assets/media/materials/programs/NoFilterFP.glsl
- http/client/assets/media/materials/programs/OculusDistortionFragment.glsl 14 additions, 0 deletions...ts/media/materials/programs/OculusDistortionFragment.glsl
- http/client/assets/media/materials/programs/OculusDistortionVertex.glsl 45 additions, 0 deletions...sets/media/materials/programs/OculusDistortionVertex.glsl
- http/client/assets/media/materials/programs/StdQuad_vp.glsl 40 additions, 0 deletionshttp/client/assets/media/materials/programs/StdQuad_vp.glsl
- http/client/assets/media/materials/programs/ambient_one_texture_vp.glsl 8 additions, 0 deletions...sets/media/materials/programs/ambient_one_texture_vp.glsl
- http/client/assets/media/materials/programs/blur.glsl 20 additions, 0 deletionshttp/client/assets/media/materials/programs/blur.glsl
- http/client/assets/media/materials/programs/camera_distortion_map_fs.glsl 20 additions, 0 deletions...ts/media/materials/programs/camera_distortion_map_fs.glsl
- http/client/assets/media/materials/programs/camera_distortion_map_vs.glsl 7 additions, 0 deletions...ts/media/materials/programs/camera_distortion_map_vs.glsl
- http/client/assets/media/materials/programs/camera_lens_flare_fs.glsl 105 additions, 0 deletions...assets/media/materials/programs/camera_lens_flare_fs.glsl
Please register or sign in to comment