diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 23046735..7aefeab1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -165,6 +165,7 @@ target_link_libraries( osgParticle osgSim osgWidget + osgText osgEarth Triton-MT-DLL libeng diff --git a/src/effects/ConeWave.cpp b/src/effects/ConeWave.cpp index cf3b5177..63255b9c 100644 --- a/src/effects/ConeWave.cpp +++ b/src/effects/ConeWave.cpp @@ -136,13 +136,13 @@ void ConeWave::CreateTexturedCone(osg::Geode* geode) { stateset->setRenderBinDetails(120, "RenderBin"); osg::ref_ptr blendFunc = new osg::BlendFunc(); stateset->setAttributeAndModes(blendFunc, osg::StateAttribute::ON); - //osg::ref_ptr 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); + osg::ref_ptr 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);