From d138f99cf18858286303ebb34cfe91cbd634fa2a Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 24 Jun 2010 14:03:51 +0000 Subject: [PATCH] Renamed osgshadercompositor to osgvirtualprogram. --- examples/CMakeLists.txt | 3 ++- .../{osgshadercompositor => osgvirtualprogram}/CMakeLists.txt | 4 ++-- .../CreateAdvancedHierachy.cpp | 0 .../CreateSimpleHierachy.cpp | 0 .../VirtualProgram.cpp | 0 .../VirtualProgram.h | 0 .../osgvirtualprogram.cpp} | 0 7 files changed, 4 insertions(+), 3 deletions(-) rename examples/{osgshadercompositor => osgvirtualprogram}/CMakeLists.txt (68%) rename examples/{osgshadercompositor => osgvirtualprogram}/CreateAdvancedHierachy.cpp (100%) rename examples/{osgshadercompositor => osgvirtualprogram}/CreateSimpleHierachy.cpp (100%) rename examples/{osgshadercompositor => osgvirtualprogram}/VirtualProgram.cpp (100%) rename examples/{osgshadercompositor => osgvirtualprogram}/VirtualProgram.h (100%) rename examples/{osgshadercompositor/osgshadercompositor.cpp => osgvirtualprogram/osgvirtualprogram.cpp} (100%) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 2cee33bdc..ddc7c9a48 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -89,7 +89,7 @@ IF(DYNAMIC_OPENSCENEGRAPH) ADD_SUBDIRECTORY(osgshaders) ADD_SUBDIRECTORY(osgshadergen) ADD_SUBDIRECTORY(osgshaderterrain) - ADD_SUBDIRECTORY(osgshadercompositor) + # ADD_SUBDIRECTORY(osgshadercompositor) ADD_SUBDIRECTORY(osgshadow) ADD_SUBDIRECTORY(osgshape) ADD_SUBDIRECTORY(osgsharedarray) @@ -116,6 +116,7 @@ IF(DYNAMIC_OPENSCENEGRAPH) ADD_SUBDIRECTORY(osgvertexattributes) ADD_SUBDIRECTORY(osgvolume) ADD_SUBDIRECTORY(osgwindows) + ADD_SUBDIRECTORY(osgvirtualprogram) ADD_SUBDIRECTORY(osganimationhardware) ADD_SUBDIRECTORY(osganimationtimeline) ADD_SUBDIRECTORY(osganimationnode) diff --git a/examples/osgshadercompositor/CMakeLists.txt b/examples/osgvirtualprogram/CMakeLists.txt similarity index 68% rename from examples/osgshadercompositor/CMakeLists.txt rename to examples/osgvirtualprogram/CMakeLists.txt index 7691d70f7..741db9b17 100644 --- a/examples/osgshadercompositor/CMakeLists.txt +++ b/examples/osgvirtualprogram/CMakeLists.txt @@ -2,10 +2,10 @@ SET(TARGET_SRC VirtualProgram.cpp CreateSimpleHierachy.cpp CreateAdvancedHierachy.cpp - osgshadercompositor.cpp + osgvirtualprogam.cpp ) SET(TARGET_H VirtualProgram.h ) -SETUP_EXAMPLE(osgshadercompositor) +SETUP_EXAMPLE(osgvirtualprogam) diff --git a/examples/osgshadercompositor/CreateAdvancedHierachy.cpp b/examples/osgvirtualprogram/CreateAdvancedHierachy.cpp similarity index 100% rename from examples/osgshadercompositor/CreateAdvancedHierachy.cpp rename to examples/osgvirtualprogram/CreateAdvancedHierachy.cpp diff --git a/examples/osgshadercompositor/CreateSimpleHierachy.cpp b/examples/osgvirtualprogram/CreateSimpleHierachy.cpp similarity index 100% rename from examples/osgshadercompositor/CreateSimpleHierachy.cpp rename to examples/osgvirtualprogram/CreateSimpleHierachy.cpp diff --git a/examples/osgshadercompositor/VirtualProgram.cpp b/examples/osgvirtualprogram/VirtualProgram.cpp similarity index 100% rename from examples/osgshadercompositor/VirtualProgram.cpp rename to examples/osgvirtualprogram/VirtualProgram.cpp diff --git a/examples/osgshadercompositor/VirtualProgram.h b/examples/osgvirtualprogram/VirtualProgram.h similarity index 100% rename from examples/osgshadercompositor/VirtualProgram.h rename to examples/osgvirtualprogram/VirtualProgram.h diff --git a/examples/osgshadercompositor/osgshadercompositor.cpp b/examples/osgvirtualprogram/osgvirtualprogram.cpp similarity index 100% rename from examples/osgshadercompositor/osgshadercompositor.cpp rename to examples/osgvirtualprogram/osgvirtualprogram.cpp