Merge branch 'master' of https://code.brigecode.icu:16623/PM/DYT

Source/src/CMakeLists.txt

@@ -91,7 +91,7 @@ INCLUDE_DIRECTORIES(
     ${Thirdparty}/OpenSceneGraph-3.6.5/include
     ${Thirdparty}/osgOcean/include
     ${Thirdparty}/matlab/include
-    ${Thirdparty}/Python39/include
+#    ${Thirdparty}/Python39/include
 )
 
  LINK_DIRECTORIES(
@@ -99,8 +99,8 @@ INCLUDE_DIRECTORIES(
     ${Thirdparty}/3rdParty_x64/lib
     ${Thirdparty}/OpenSceneGraph-3.6.5/lib
     ${Thirdparty}/osgOcean/lib
-     ${Thirdparty}/matlab/lib/win64/microsoft
+    ${Thirdparty}/matlab/lib/win64/microsoft
-     ${Thirdparty}/Python39/libs
+#    ${Thirdparty}/Python39/libs
  )
 
  if(MSVC)
@@ -169,7 +169,7 @@ target_link_libraries(
     osgSim
     libMatlabDataArray
     libMatlabEngine
-    python39
+#    python39
 )
 
 if(${QT_VERSION_MAJOR} LESS 6)
@@ -184,7 +184,7 @@ endif()
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${ProjectDIR}/bin)
 
 TARGET_LINK_LIBRARIES(${PROJECT_NAME})
-SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:CONSOLE")
+#SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:CONSOLE")
 
 add_custom_command(TARGET ${PROJECT_NAME}
     POST_BUILD

Source/src/app/Application.cpp

@@ -31,11 +31,11 @@ void Application::Init() {
     Singleton<EntitiesManager>::Create(this);
     Singleton<WorkSpaceManager>::Create(this);
     Singleton<NetDriver>::Create(this);
-    Singleton<PythonModule>::Create(this);
+    //Singleton<PythonModule>::Create(this);
 }
 
 void Application::Uninit() {
-    Singleton<PythonModule>::Destory();
+    //Singleton<PythonModule>::Destory();
     Singleton<NetDriver>::Destory();
     Singleton<WorkSpaceManager>::Destory();
     Singleton<EntitiesManager>::Destory();

Source/src/common/RecourceHelper.cpp

@@ -81,6 +81,7 @@ void RecourceHelper::Init() {
 #else
     const QString transName = QString("./translations/%1_%2.qm").arg(appName, QLocale().name());
 #endif
+    qDebug() << transName;
     bool success = trans_.load(transName);
     if (!success) {
         qDebug() << "load translations error";

Source/src/python/PythonModule.cpp

@@ -1,3 +1,4 @@
+#if 0
 #include "python/PythonModule.h"
 
 #include <assert.h>
@@ -86,3 +87,4 @@ bool PythonModule::InitEnv() {
     }
     return true;
 }
+#endif

Source/src/python/PythonModule.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#if 0
 #include <unordered_map>
 
 #include <QObject>
@@ -27,3 +28,4 @@ private:
 
 
 };
+#endif

Source/src/scene/OsgScene.cpp

@@ -407,15 +407,15 @@ void OsgScene::AttachView(OsgView* view) {
         return;
     }
 
-    osg::Node* node1 = osgDB::readNodeFile("chaff_bombs.osg");
+    //osg::Node* node1 = osgDB::readNodeFile("chaff_bombs.osg");
-    node1->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
+    //node1->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
-    osg::MatrixTransform* mt = new osg::MatrixTransform;
+    //osg::MatrixTransform* mt = new osg::MatrixTransform;
-    mt->addChild(node1);
+    //mt->addChild(node1);
-    //GetOceanScene()->addChild(mt);
+    ////GetOceanScene()->addChild(mt);
-    entityRoot_->addChild(mt);
+    //entityRoot_->addChild(mt);
-    osg::Vec3 eye(0.0f, 60.f, 50.0f);
+    //osg::Vec3 eye(0.0f, 60.f, 50.0f);
-    mt->setMatrix(osg::Matrix::translate(eye)/* * osg::Matrix::scale(osg::Vec3(10, 10, 10))*/);
+    //mt->setMatrix(osg::Matrix::translate(eye)/* * osg::Matrix::scale(osg::Vec3(10, 10, 10))*/);
-    ////mt->getOrCreateStateSet()-
+    //////mt->getOrCreateStateSet()-
 
     osg::Node* node = view->GetView()->getSceneData();
     if (nullptr == node) {