diff --git a/Source/src/CMakeLists.txt b/Source/src/CMakeLists.txt index 7cf56942..4600a883 100644 --- a/Source/src/CMakeLists.txt +++ b/Source/src/CMakeLists.txt @@ -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 diff --git a/Source/src/scene/OsgScene.cpp b/Source/src/scene/OsgScene.cpp index 957a4e9a..dbbd92e9 100644 --- a/Source/src/scene/OsgScene.cpp +++ b/Source/src/scene/OsgScene.cpp @@ -407,15 +407,15 @@ void OsgScene::AttachView(OsgView* view) { return; } - osg::Node* node1 = osgDB::readNodeFile("chaff_bombs.osg"); - node1->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF); - osg::MatrixTransform* mt = new osg::MatrixTransform; - mt->addChild(node1); - //GetOceanScene()->addChild(mt); - entityRoot_->addChild(mt); - osg::Vec3 eye(0.0f, 60.f, 50.0f); - mt->setMatrix(osg::Matrix::translate(eye)/* * osg::Matrix::scale(osg::Vec3(10, 10, 10))*/); - ////mt->getOrCreateStateSet()- + //osg::Node* node1 = osgDB::readNodeFile("chaff_bombs.osg"); + //node1->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF); + //osg::MatrixTransform* mt = new osg::MatrixTransform; + //mt->addChild(node1); + ////GetOceanScene()->addChild(mt); + //entityRoot_->addChild(mt); + //osg::Vec3 eye(0.0f, 60.f, 50.0f); + //mt->setMatrix(osg::Matrix::translate(eye)/* * osg::Matrix::scale(osg::Vec3(10, 10, 10))*/); + //////mt->getOrCreateStateSet()- osg::Node* node = view->GetView()->getSceneData(); if (nullptr == node) { diff --git a/Source/src/translations/Dyt_zh_CN.bak.qm b/Source/src/translations/Dyt_zh_CN.bak.qm new file mode 100644 index 00000000..7d92a45b Binary files /dev/null and b/Source/src/translations/Dyt_zh_CN.bak.qm differ