1、修改距离地面太近穿地的问题

2、增加视域分析接口，功能还未添加
MJYCo-Ltd · Apr 9, 2021 · f6deb13 · f6deb13
1 parent 4ad1244
commit f6deb13
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 12 deletions.
diff --git a/LoadMap/main.cpp b/LoadMap/main.cpp
@@ -60,7 +60,7 @@ int main(int argc, char *argv[])
 
 
 
-    auto pScene = GetSceneCore()->GetSceneGraphManager()->CreateSceneGraph(ISceneGraph::SCENEGRAPH_USER);
+    auto pScene = GetSceneCore()->GetSceneGraphManager()->CreateSceneGraph(ISceneGraph::SCENEGRAPH_3D);
     //pScene->GetMap()->GetSpaceEnv()->SetMilkywayVisible(false);
 //    for(auto one:pScene->GetMap()->GetMapLayers())
 //    {

diff --git a/Plot/Map/Map.cpp b/Plot/Map/Map.cpp
@@ -5,11 +5,10 @@
 #include <osgEarth/Lighting>
 
 #if OSGEARTH_VERSION_GREATER_OR_EQUAL(3,0,0)
-#include <osgEarth/LogarithmicDepthBuffer>
+#include <osgEarth/AutoClipPlaneHandler>
 #else
-#include <osgEarthUtil/LogarithmicDepthBuffer>
+#include <osgEarthUtil/AutoClipPlaneHandler>
 #endif
-
 #include <osgEarth/GLUtils>
 
 #include <Satellite/Date.h>
@@ -458,13 +457,10 @@ void CMap::InitMap()
 #if OSGEARTH_VERSION_GREATER_OR_EQUAL(3,0,0)
             m_pMap3DNode->open();
 #endif
-            osgEarth::Util::LogarithmicDepthBuffer buffer;
-            buffer.setUseFragDepth(true);
-            buffer.install(m_pMap3DNode.get());
-
             m_pSpaceEnv = new CSpaceEnv(m_pSceneGraph);
             osg::Camera* pCamera = dynamic_cast<IOsgViewPoint*>(m_pSceneGraph->GetMainWindow()->GetMainViewPoint())
                     ->GetOsgView()->getCamera();
+            pCamera->addCullCallback(new osgEarth::Util::AutoClipPlaneCullCallback(m_pMap3DNode));
             m_pSpaceEnv->SetMainCamara(pCamera);
             m_pSpaceEnv->Init();
 

diff --git a/SceneCore/SceneGraph/MyEarthManipulator.cpp b/SceneCore/SceneGraph/MyEarthManipulator.cpp
@@ -22,12 +22,12 @@ void CMyEarthManipulator::ChangeMap(MapType emType)
         case MAP_3D:
             getSettings()->setThrowingEnabled(true);
             getSettings()->setThrowDecayRate(0.009);
-            getSettings()->setMinMaxDistance(1,DBL_MAX);
+            getSettings()->setMinMaxDistance(100,DBL_MAX);
             getSettings()->setLockAzimuthWhilePanning(false);
             getSettings()->setTerrainAvoidanceEnabled(true);
             break;
         case MAP_2D:
-            getSettings()->setMinMaxDistance(10,m_dMaxDistance);
+            getSettings()->setMinMaxDistance(100,m_dMaxDistance);
             auto vp = getViewpoint();
             if(AdjustViewPoint(vp))
             {

diff --git a/Tool/Analysis/Analysis.pro b/Tool/Analysis/Analysis.pro
@@ -5,7 +5,9 @@ TEMPLATE = lib
 include($$PWD/../Tool.pri)
 
 HEADERS += \
-    AnalysisTool.h
+    AnalysisTool.h \
+    ViewAnalysis.h
 
 SOURCES += \
-    AnalysisTool.cpp
+    AnalysisTool.cpp \
+    ViewAnalysis.cpp
diff --git a/Tool/Analysis/AnalysisTool.cpp b/Tool/Analysis/AnalysisTool.cpp
@@ -12,5 +12,6 @@ ITool *CreateTool(ISceneGraph *pSceneGraph, const std::string &sInterfaceName)
 
 bool QueryInterface(std::string& sInterfaceName)
 {
+    sInterfaceName = "IViewAnalysis";
     return(false);
 }
diff --git a/Tool/Analysis/ViewAnalysis.cpp b/Tool/Analysis/ViewAnalysis.cpp
@@ -0,0 +1,10 @@
+#include "ViewAnalysis.h"
+
+bool CViewAnalysis::InitTool()
+{
+    return(true);
+}
+
+void CViewAnalysis::ReleaseTool()
+{
+}
diff --git a/Tool/Analysis/ViewAnalysis.h b/Tool/Analysis/ViewAnalysis.h
@@ -0,0 +1,18 @@
+#ifndef CVIEWANALYSIS_H
+#define CVIEWANALYSIS_H
+
+#include "../IToolBase.h"
+class CViewAnalysis:public IToolBase
+{
+public:
+public:
+    CViewAnalysis(ISceneGraph* pSceneGraph,CToolSelector*pToolSelector):IToolBase(pSceneGraph,pToolSelector){}
+
+    /**
+     * @brief 初始化工具
+     */
+    bool InitTool();
+    void ReleaseTool();
+};
+
+#endif // CVIEWANALYSIS_H