PM/DYTSrouce
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modify conewave

Browse Source
This commit is contained in:
jiegeaiai 2025-01-23 21:46:41 +08:00
parent 74f4d658d1
commit c733281598
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/CMakeLists.txt
View File

@ -103,7 +103,7 @@ INCLUDE_DIRECTORIES(
if(MSVC)
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi") #/Od
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi /Od") #/Od
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
foreach(var
@ -185,7 +185,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

12
src/effects/ConeWave.cpp
View File

@ -93,6 +93,7 @@ void ConeWave::CreateTexturedCone(osg::Geode* geode) {
//return;
static const char* vertSource = {
"#version 330\n"
"varying vec3 pos;\n"
"void main()\n"
"{\n"
@ -103,6 +104,7 @@ void ConeWave::CreateTexturedCone(osg::Geode* geode) {
"}\n"
};
static const char* fragSource = {
"#version 330\n"
"uniform float num; \n"
"uniform float height; \n"
"uniform vec4 baseColor;\n"
@ -134,9 +136,13 @@ void ConeWave::CreateTexturedCone(osg::Geode* geode) {
stateset->setRenderBinDetails(120, "RenderBin");
osg::ref_ptr<osg::BlendFunc> blendFunc = new osg::BlendFunc();
stateset->setAttributeAndModes(blendFunc, osg::StateAttribute::ON);
osg::ref_ptr<osg::Program> program = new osg::Program();
program->addShader(vertexShader);
program->addShader(fragmentShader);
//osg::ref_ptr<osg::Program> program = new osg::Program();
//program->addShader(vertexShader);
//program->addShader(fragmentShader);
VirtualProgram* vp = VirtualProgram::getOrCreate(outlineSS);
vp->setFunction("VS", VS, ShaderComp::LOCATION_VERTEX_CLIP);
vp->setFunction("FS", FS, ShaderComp::LOCATION_FRAGMENT_COLORING);
outline->addChild(node);
baseColorUniform_ = new osg::Uniform("baseColor", baseColor_);
stateset->setMode(GL_CULL_FACE, osg::StateAttribute::ON);

2
src/translations/Dyt_zh_CN.ts
View File

@ -1300,7 +1300,7 @@
<message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8683"/>
<source>Path</source>
<translation type="unfinished"></translation>
<translation type="unfinished">路径</translation>
</message>
</context>
<context>