Skip to content

Commit

Permalink
Merge pull request #588 from ros-visualization/gl_version_detection
Browse files Browse the repository at this point in the history
Explicit detection of GLSL version
  • Loading branch information
David Gossow committed Feb 10, 2013
2 parents 720d1e3 + 86d83c0 commit 5d3fb20
Show file tree
Hide file tree
Showing 38 changed files with 424 additions and 364 deletions.
202 changes: 0 additions & 202 deletions ogre_media/materials/glsl/glsl_programs.program

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
152 changes: 152 additions & 0 deletions ogre_media/materials/glsl120/glsl120.program
@@ -0,0 +1,152 @@

//includes:
fragment_program rviz/glsl120/include/circle_impl.frag glsl { source include/circle_impl.frag }
fragment_program rviz/glsl120/include/pack_depth.frag glsl { source include/pack_depth.frag }
vertex_program rviz/glsl120/include/pass_depth.vert glsl { source include/pass_depth.vert }

//all shaders, sorted by name


fragment_program rviz/glsl120/depth_circle.frag glsl
{
source depth_circle.frag
attach rviz/glsl120/include/pack_depth.frag
attach rviz/glsl120/include/circle_impl.frag
default_params
{
param_named_auto alpha custom 1
param_named_auto far_clip_distance far_clip_distance
}
}


fragment_program rviz/glsl120/depth.frag glsl
{
source depth.frag
attach rviz/glsl120/include/pack_depth.frag
default_params
{
param_named_auto alpha custom 1
param_named_auto far_clip_distance far_clip_distance
}
}


vertex_program rviz/glsl120/depth.vert glsl
{
source depth.vert
preprocessor_defines WITH_DEPTH=1
attach rviz/glsl120/include/pass_depth.vert
default_params {
param_named_auto worldviewproj_matrix worldviewproj_matrix
param_named_auto worldview_matrix worldview_matrix
}
}


fragment_program rviz/glsl120/flat_color.frag glsl
{
source flat_color.frag
default_params
{
param_named_auto highlight custom 5
param_named_auto alpha custom 1
}
}


fragment_program rviz/glsl120/flat_color_circle.frag glsl
{
source flat_color_circle.frag
attach rviz/glsl120/include/circle_impl.frag
default_params
{
param_named_auto highlight custom 5
param_named_auto alpha custom 1
}
}


fragment_program rviz/glsl120/pass_color_circle.frag glsl
{
source pass_color_circle.frag
attach rviz/glsl120/include/circle_impl.frag
}


fragment_program rviz/glsl120/pass_color.frag glsl
{
source pass_color.frag
}


fragment_program rviz/glsl120/pickcolor_circle.frag glsl
{
source pickcolor_circle.frag
attach rviz/glsl120/include/circle_impl.frag
default_params
{
param_named_auto pick_color custom 2
}
}


fragment_program rviz/glsl120/pickcolor.frag glsl
{
source pickcolor.frag
default_params
{
param_named_auto pick_color custom 2
}
}


fragment_program rviz/glsl120/black.frag glsl
{
source black.frag
}


vertex_program rviz/glsl120/point.vert glsl
{
source point.vert
default_params {
param_named_auto worldviewproj_matrix worldviewproj_matrix
param_named_auto size custom 0
}
}
vertex_program rviz/glsl120/point.vert(with_depth) glsl
{
source point.vert
preprocessor_defines WITH_DEPTH=1
attach rviz/glsl120/include/pass_depth.vert
default_params {
param_named_auto worldviewproj_matrix worldviewproj_matrix
param_named_auto worldview_matrix worldview_matrix
param_named_auto size custom 0
}
}



fragment_program rviz/glsl120/shaded_circle.frag glsl
{
source shaded_circle.frag
default_params
{
param_named_auto highlight custom 5
param_named_auto alpha custom 1
}
}


fragment_program rviz/glsl120/smooth_square.frag glsl
{
source smooth_square.frag
default_params
{
param_named_auto highlight custom 5
param_named_auto alpha custom 1
}
}

0 comments on commit 5d3fb20

Please sign in to comment.