Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ogre 1.10: prevent loading resource under same name twice #1094

Closed
wants to merge 1 commit into from
Closed

ogre 1.10: prevent loading resource under same name twice #1094

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ogre_media/materials/glsl120/nogp/nogp.program
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// and each one is offset according to its texture coords.

//includes:
vertex_program rviz/glsl120/include/pass_depth.vert glsl { source ../include/pass_depth.vert }
vertex_program rviz/glsl120/include/nogp_pass_depth.vert glsl { source ../include/pass_depth.vert }

vertex_program rviz/glsl120/nogp/billboard_tile.vert glsl
{
Expand All @@ -21,7 +21,7 @@ vertex_program rviz/glsl120/nogp/billboard_tile.vert(with_depth) glsl
{
source billboard_tile.vert
preprocessor_defines WITH_DEPTH=1
attach rviz/glsl120/include/pass_depth.vert
attach rviz/glsl120/include/nogp_pass_depth.vert
default_params
{
param_named_auto worldviewproj_matrix worldviewproj_matrix
Expand All @@ -47,7 +47,7 @@ vertex_program rviz/glsl120/nogp/billboard.vert(with_depth) glsl
{
source billboard.vert
preprocessor_defines WITH_DEPTH=1
attach rviz/glsl120/include/pass_depth.vert
attach rviz/glsl120/include/nogp_pass_depth.vert
default_params {
param_named_auto worldviewproj_matrix worldviewproj_matrix
param_named_auto worldview_matrix worldview_matrix
Expand All @@ -71,7 +71,7 @@ vertex_program rviz/glsl120/nogp/box.vert(with_depth) glsl
{
source box.vert
preprocessor_defines WITH_DEPTH=1
attach rviz/glsl120/include/pass_depth.vert
attach rviz/glsl120/include/nogp_pass_depth.vert
default_params {
param_named_auto worldviewproj_matrix worldviewproj_matrix
param_named_auto worldview_matrix worldview_matrix
Expand Down