From 3c4dc93e44e562bb1f2dae7804258c98004fb325 Mon Sep 17 00:00:00 2001 From: epifanio Date: Sat, 30 Jul 2016 07:40:18 -0400 Subject: [PATCH 1/3] Update to OSG 3.4 --- include/ossimPlanet/ossimPlanetKmlScreenOverlayNode.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/ossimPlanet/ossimPlanetKmlScreenOverlayNode.h b/include/ossimPlanet/ossimPlanetKmlScreenOverlayNode.h index 14a2be2..2ca3baa 100644 --- a/include/ossimPlanet/ossimPlanetKmlScreenOverlayNode.h +++ b/include/ossimPlanet/ossimPlanetKmlScreenOverlayNode.h @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include @@ -21,7 +21,7 @@ class ossimPlanetKmlScreenOverlayNode : public ossimPlanetKmlLayerNode void computeScreenXY(osg::Vec3d& position); void computeSize(osg::Vec3d& size); - osg::ref_ptr theCameraNode; + osg::ref_ptr theCameraNode; osg::ref_ptr theGroup; osg::ref_ptr theViewport; osg::ref_ptr theIconGeode; From 0e2987fe137f010c902dc042371b8671d888b91b Mon Sep 17 00:00:00 2001 From: epifanio Date: Sat, 30 Jul 2016 07:55:46 -0400 Subject: [PATCH 2/3] Update ossimPlanetKmlScreenOverlayNode.cpp to OSG 3.4 --- src/ossimPlanet/ossimPlanetKmlScreenOverlayNode.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ossimPlanet/ossimPlanetKmlScreenOverlayNode.cpp b/src/ossimPlanet/ossimPlanetKmlScreenOverlayNode.cpp index 422384d..4985a6c 100644 --- a/src/ossimPlanet/ossimPlanetKmlScreenOverlayNode.cpp +++ b/src/ossimPlanet/ossimPlanetKmlScreenOverlayNode.cpp @@ -11,7 +11,7 @@ ossimPlanetKmlScreenOverlayNode::ossimPlanetKmlScreenOverlayNode(ossimPlanetKmlL ossimPlanetKmlObject* obj) :ossimPlanetKmlLayerNode(layer, obj) { - theCameraNode = new osg::CameraNode; + theCameraNode = new osg::Camera; theGroup = new osg::Group; theCameraNode->setReferenceFrame(osg::Transform::ABSOLUTE_RF); theCameraNode->setViewMatrix(osg::Matrix::identity()); From 7c7b94d0dbd5d587d767efcce85fb2ff0eef8abf Mon Sep 17 00:00:00 2001 From: epifanio Date: Sat, 30 Jul 2016 07:57:14 -0400 Subject: [PATCH 3/3] Update ossimPlanetKmlScreenOverlayNode.cpp to OSG 3.4 --- src/ossimPlanet/ossimPlanetKmlScreenOverlayNode.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ossimPlanet/ossimPlanetKmlScreenOverlayNode.cpp b/src/ossimPlanet/ossimPlanetKmlScreenOverlayNode.cpp index 4985a6c..ba7166c 100644 --- a/src/ossimPlanet/ossimPlanetKmlScreenOverlayNode.cpp +++ b/src/ossimPlanet/ossimPlanetKmlScreenOverlayNode.cpp @@ -16,7 +16,7 @@ ossimPlanetKmlScreenOverlayNode::ossimPlanetKmlScreenOverlayNode(ossimPlanetKmlL theCameraNode->setReferenceFrame(osg::Transform::ABSOLUTE_RF); theCameraNode->setViewMatrix(osg::Matrix::identity()); theCameraNode->setClearMask(GL_DEPTH_BUFFER_BIT); - theCameraNode->setRenderOrder(osg::CameraNode::POST_RENDER); + theCameraNode->setRenderOrder(osg::Camera::POST_RENDER); theGroup->addChild(theCameraNode.get()); theViewportChangedFlag = false; theNeedsUpdateFlag = false;