- remove the SG_GLxxxx_H #defines, since OSG provides its own versions

[simgear.git] / simgear / scene / model / shadowvolume.cxx

diff --git a/simgear/scene/model/shadowvolume.cxx b/simgear/scene/model/shadowvolume.cxx
index 843dd404fe5948120866b7b1f6ddf9c4433921fe..3a164a16509772653f7cc529af31c355fbe92ade 100644 (file)
--- a/simgear/scene/model/shadowvolume.cxx
+++ b/simgear/scene/model/shadowvolume.cxx
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 //
 
@@ -25,14 +25,12 @@
 #endif
 
 #include <plib/sg.h>
-#include <plib/ssg.h>
-#include <simgear/props/props.hxx>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/screen/extensions.hxx>
 #include <simgear/scene/model/animation.hxx>
 #include <simgear/scene/model/model.hxx>
 #include <simgear/environment/visual_enviro.hxx>
-#include SG_GLU_H
+#include <osg/GLU>
 
 #include "shadowvolume.hxx"
 
@@ -905,7 +903,6 @@ void SGShadowVolume::deleteOccluderFromTile(ssgBranch *tile) {
 }
 
 void SGShadowVolume::deleteOccluder(ssgBranch *occluder) {
-       ssgBranch *branch = occluder;
        // skip first node and go to first transform (placement)
        while( occluder && !occluder->isA(ssgTypeTransform()))
                occluder = (ssgBranch *) occluder->getKid(0);
@@ -919,9 +916,6 @@ void SGShadowVolume::deleteOccluder(ssgBranch *occluder) {
 }
 
 void SGShadowVolume::addOccluder(ssgBranch *occluder, OccluderType occluder_type, ssgBranch *tile) {
-
-       ssgBranch *branch = occluder;
-
        // skip first node and go to first transform (placement)
        while( occluder && !occluder->isA(ssgTypeTransform()))
                occluder = (ssgBranch *) occluder->getKid(0);