FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Completed firt pass implementation FixedFunction and ShaderTechnique.

Browse Source
This commit is contained in:
Robert Osfield 2009-01-16 16:21:54 +00:00
parent 29ac92df0e
commit 9d4b44f956
3 changed files with 49 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/osgVolume/FixedFunctionTechnique
View File

@ -34,6 +34,11 @@ class OSGVOLUME_EXPORT FixedFunctionTechnique : public VolumeTechnique
virtual void update(osgUtil::UpdateVisitor* nv);
virtual void cull(osgUtil::CullVisitor* nv);
void setNumSlices(unsigned int numSlices);
unsigned int getNumSlices() const { return _numSlices; }
/** Clean scene graph from any terrain technique specific nodes.*/
virtual void cleanSceneGraph();
@ -46,6 +51,8 @@ class OSGVOLUME_EXPORT FixedFunctionTechnique : public VolumeTechnique
virtual ~FixedFunctionTechnique();
osg::ref_ptr<osg::Node> _node;
unsigned int _numSlices;
};
}

105
src/osgVolume/FixedFunctionTechnique.cpp
View File

@ -28,12 +28,14 @@
using namespace osgVolume;
FixedFunctionTechnique::FixedFunctionTechnique()
FixedFunctionTechnique::FixedFunctionTechnique():
_numSlices(500)
{
}
FixedFunctionTechnique::FixedFunctionTechnique(const FixedFunctionTechnique& fft,const osg::CopyOp& copyop):
VolumeTechnique(fft,copyop)
VolumeTechnique(fft,copyop),
_numSlices(fft._numSlices)
{
}
@ -41,7 +43,16 @@ FixedFunctionTechnique::~FixedFunctionTechnique()
{
}
osg::Node* createCube(float size,float alpha, unsigned int numSlices, float sliceEnd=1.0f)
void FixedFunctionTechnique::setNumSlices(unsigned int numSlices)
{
if (_numSlices==numSlices) return;
_numSlices = numSlices;
if (_volumeTile) _volumeTile->setDirty(true);
}
osg::Node* createCube(const osg::Vec3& center, float size, unsigned int numSlices)
{
// set up the Geometry.
@ -49,7 +60,7 @@ osg::Node* createCube(float size,float alpha, unsigned int numSlices, float slic
float halfSize = size*0.5f;
float y = halfSize;
float dy =-size/(float)(numSlices-1)*sliceEnd;
float dy =-size/(float)(numSlices-1);
//y = -halfSize;
//dy *= 0.5;
@ -70,7 +81,7 @@ osg::Node* createCube(float size,float alpha, unsigned int numSlices, float slic
geom->setNormalBinding(osg::Geometry::BIND_OVERALL);
osg::Vec4Array* colors = new osg::Vec4Array(1);
(*colors)[0].set(1.0f,1.0f,1.0f,alpha);
(*colors)[0].set(1.0f,1.0f,1.0f,1.0);
geom->setColorArray(colors);
geom->setColorBinding(osg::Geometry::BIND_OVERALL);
@ -79,7 +90,7 @@ osg::Node* createCube(float size,float alpha, unsigned int numSlices, float slic
osg::Billboard* billboard = new osg::Billboard;
billboard->setMode(osg::Billboard::POINT_ROT_WORLD);
billboard->addDrawable(geom);
billboard->setPosition(0,osg::Vec3(0.0f,0.0f,0.0f));
billboard->setPosition(0,center);
return billboard;
}
@ -136,74 +147,37 @@ void FixedFunctionTechnique::init()
osg::notify(osg::NOTICE)<<"Matrix = "<<matrix<<std::endl;
unsigned int numSlices=500;
float sliceEnd=1.0f;
float xSize = 1.0;
float ySize = 1.0;
float zSize = 1.0;
float xMultiplier = 1.0;
float yMultiplier = 1.0;
float zMultiplier = 1.0;
osg::BoundingBox bb(-xSize*0.5f,-ySize*0.5f,-zSize*0.5f,xSize*0.5f,ySize*0.5f,zSize*0.5f);
osg::Texture::FilterMode minFilter = osg::Texture::NEAREST;
osg::Texture::FilterMode magFilter = osg::Texture::NEAREST;
float maxAxis = xSize;
if (ySize > maxAxis) maxAxis = ySize;
if (zSize > maxAxis) maxAxis = zSize;
osg::Group* group = new osg::Group;
osg::Vec3d v000 = osg::Vec3d(0.0,0.0,0.0) * matrix;
osg::Vec3d v100 = osg::Vec3d(1.0,0.0,0.0) * matrix;
osg::Vec3d v010 = osg::Vec3d(0.0,1.0,0.0) * matrix;
osg::Vec3d v110 = osg::Vec3d(1.0,1.0,0.0) * matrix;
osg::TexGenNode* texgenNode_0 = new osg::TexGenNode;
texgenNode_0->setTextureUnit(0);
texgenNode_0->getTexGen()->setMode(osg::TexGen::EYE_LINEAR);
texgenNode_0->getTexGen()->setPlane(osg::TexGen::S, osg::Plane(xMultiplier/xSize,0.0f,0.0f,0.5f));
texgenNode_0->getTexGen()->setPlane(osg::TexGen::T, osg::Plane(0.0f,yMultiplier/ySize,0.0f,0.5f));
texgenNode_0->getTexGen()->setPlane(osg::TexGen::R, osg::Plane(0.0f,0.0f,zMultiplier/zSize,0.5f));
osg::Vec3d v001 = osg::Vec3d(0.0,0.0,1.0) * matrix;
osg::Vec3d v101 = osg::Vec3d(1.0,0.0,1.0) * matrix;
osg::Vec3d v011 = osg::Vec3d(0.0,1.0,1.0) * matrix;
osg::Vec3d v111 = osg::Vec3d(1.0,1.0,1.0) * matrix;
group->addChild(texgenNode_0);
float cubeSize = sqrtf(xSize*xSize+ySize*ySize+zSize*zSize);
double cubeSize = (v111-v000).length();
osg::Vec3d center = (v000+v111)*0.5;
osg::ClipNode* clipnode = new osg::ClipNode;
clipnode->addChild(createCube(cubeSize,1.0f, numSlices,sliceEnd));
clipnode->createClipBox(bb);
clipnode->addChild(createCube(center, cubeSize, _numSlices));
{
// set up the Geometry to enclose the clip volume to prevent near/far clipping from affecting billboard
osg::Geometry* geom = new osg::Geometry;
osg::Vec3Array* coords = new osg::Vec3Array();
coords->push_back(bb.corner(0));
coords->push_back(bb.corner(1));
coords->push_back(bb.corner(2));
coords->push_back(bb.corner(3));
coords->push_back(bb.corner(4));
coords->push_back(bb.corner(5));
coords->push_back(bb.corner(6));
coords->push_back(bb.corner(7));
geom->setVertexArray(coords);
osg::Vec4Array* colors = new osg::Vec4Array(1);
(*colors)[0].set(1.0f,1.0f,1.0f,1.0f);
geom->setColorArray(colors);
geom->setColorBinding(osg::Geometry::BIND_OVERALL);
geom->addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::POINTS,0,coords->size()));
osg::Geode* geode = new osg::Geode;
geode->addDrawable(geom);
clipnode->addChild(geode);
}
clipnode->addClipPlane(new osg::ClipPlane(0, osg::Plane(v000, v011, v001)));
clipnode->addClipPlane(new osg::ClipPlane(1, osg::Plane(v100, v111, v110)));
clipnode->addClipPlane(new osg::ClipPlane(2, osg::Plane(v000, v101, v100)));
clipnode->addClipPlane(new osg::ClipPlane(3, osg::Plane(v110, v011, v010)));
clipnode->addClipPlane(new osg::ClipPlane(4, osg::Plane(v000, v110, v010)));
clipnode->addClipPlane(new osg::ClipPlane(5, osg::Plane(v001, v111, v101)));
osg::TexGenNode* texgenNode_0 = new osg::TexGenNode;
texgenNode_0->addChild(clipnode);
texgenNode_0->setTextureUnit(0);
texgenNode_0->getTexGen()->setMode(osg::TexGen::EYE_LINEAR);
texgenNode_0->getTexGen()->setPlanesFromMatrix(osg::Matrix::inverse(matrix));
osg::StateSet* stateset = texgenNode_0->getOrCreateStateSet();
@ -254,8 +228,7 @@ void FixedFunctionTechnique::init()
stateset->setTextureAttributeAndModes(0,new osg::TexEnv(),osg::StateAttribute::ON);
_node = group;
_node = texgenNode_0;
}
void FixedFunctionTechnique::update(osgUtil::UpdateVisitor* uv)

98
src/osgVolume/ShaderTechnique.cpp
View File

@ -49,36 +49,6 @@ enum ShadingModel
MaximumIntensityProjection
};
class CollectPropertiesVisitor : public osgVolume::PropertyVisitor
{
public:
CollectPropertiesVisitor() {}
virtual void apply(Property&) {}
virtual void apply(CompositeProperty& cp)
{
for(unsigned int i=0; i<cp.getNumProperties(); ++i)
{
cp.getProperty(i)->accept(*this);
}
}
virtual void apply(TransferFunctionProperty& tf) { _tfProperty = &tf; }
virtual void apply(ScalarProperty&) {}
virtual void apply(IsoSurfaceProperty& iso) { _isoProperty = &iso; }
virtual void apply(AlphaFuncProperty& af) { _afProperty = &af; }
virtual void apply(MaximumIntensityProjectionProperty& mip) { _mipProperty = &mip; }
virtual void apply(LightingProperty& lp) { _lightingProperty = &lp; }
osg::ref_ptr<TransferFunctionProperty> _tfProperty;
osg::ref_ptr<IsoSurfaceProperty> _isoProperty;
osg::ref_ptr<AlphaFuncProperty> _afProperty;
osg::ref_ptr<MaximumIntensityProjectionProperty> _mipProperty;
osg::ref_ptr<LightingProperty> _lightingProperty;
};
void ShaderTechnique::init()
{
osg::notify(osg::NOTICE)<<"ShaderTechnique::init()"<<std::endl;
@ -145,15 +115,14 @@ void ShaderTechnique::init()
osg::notify(osg::NOTICE)<<"Matrix = "<<matrix<<std::endl;
osg::Image* normalmap_3d = 0;
osg::Texture::InternalFormatMode internalFormatMode = osg::Texture::USE_IMAGE_DATA_FORMAT;
float xSize = (matrix)(0,0);
float ySize = (matrix)(1,1);
float zSize = (matrix)(2,2);
if (true)
{
{
osg::Texture::FilterMode minFilter = osg::Texture::LINEAR;
osg::Texture::FilterMode magFilter = osg::Texture::LINEAR;
@ -177,7 +146,6 @@ void ShaderTechnique::init()
program->addShader(new osg::Shader(osg::Shader::VERTEX, volume_vert));
}
if (!(normalmap_3d && tf))
{
// set up the 3d texture itself,
// note, well set the filtering up so that mip mapping is disabled,
@ -286,63 +254,6 @@ void ShaderTechnique::init()
program->addShader(new osg::Shader(osg::Shader::FRAGMENT, volume_iso_frag));
}
}
}
else if (normalmap_3d)
{
osg::notify(osg::NOTICE)<<"Setting up normalmapping shader"<<std::endl;
osg::Uniform* normalMapSampler = new osg::Uniform("normalMap",1);
stateset->addUniform(normalMapSampler);
osg::Texture3D* normalMap = new osg::Texture3D;
normalMap->setImage(normalmap_3d);
normalMap->setResizeNonPowerOfTwoHint(false);
normalMap->setInternalFormatMode(internalFormatMode);
normalMap->setFilter(osg::Texture3D::MIN_FILTER, osg::Texture::LINEAR);
normalMap->setFilter(osg::Texture3D::MAG_FILTER, osg::Texture::LINEAR);
normalMap->setWrap(osg::Texture3D::WRAP_R,osg::Texture3D::CLAMP_TO_EDGE);
normalMap->setWrap(osg::Texture3D::WRAP_S,osg::Texture3D::CLAMP_TO_EDGE);
normalMap->setWrap(osg::Texture3D::WRAP_T,osg::Texture3D::CLAMP_TO_EDGE);
stateset->setTextureAttributeAndModes(1,normalMap,osg::StateAttribute::ON);
if (tf)
{
osg::Texture1D* texture1D = new osg::Texture1D;
texture1D->setImage(tf->getImage());
texture1D->setResizeNonPowerOfTwoHint(false);
texture1D->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
texture1D->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
texture1D->setWrap(osg::Texture::WRAP_R,osg::Texture::CLAMP_TO_EDGE);
stateset->setTextureAttributeAndModes(0,texture1D,osg::StateAttribute::ON);
osg::Shader* fragmentShader = osgDB::readShaderFile(osg::Shader::FRAGMENT, "volume-tf-n.frag");
if (fragmentShader)
{
program->addShader(fragmentShader);
}
else
{
#include "Shaders/volume_tf_n_frag.cpp"
program->addShader(new osg::Shader(osg::Shader::FRAGMENT, volume_tf_n_frag));
}
osg::Uniform* tfTextureSampler = new osg::Uniform("tfTexture",0);
stateset->addUniform(tfTextureSampler);
}
else
{
osg::Shader* fragmentShader = osgDB::readShaderFile(osg::Shader::FRAGMENT, "volume-n.frag");
if (fragmentShader)
{
program->addShader(fragmentShader);
}
else
{
#include "Shaders/volume_n_frag.cpp"
program->addShader(new osg::Shader(osg::Shader::FRAGMENT, volume_n_frag));
}
}
}
else if (tf)
{
@ -397,10 +308,7 @@ void ShaderTechnique::init()
osg::TexGen* texgen = new osg::TexGen;
texgen->setMode(osg::TexGen::OBJECT_LINEAR);
texgen->setPlane(osg::TexGen::S, osg::Plane(1.0f/xSize,0.0f,0.0f,0.0f));
texgen->setPlane(osg::TexGen::T, osg::Plane(0.0f,1.0f/ySize,0.0f,0.0f));
texgen->setPlane(osg::TexGen::R, osg::Plane(0.0f,0.0f,1.0f/zSize,0.0f));
texgen->setPlane(osg::TexGen::Q, osg::Plane(0.0f,0.0f,0.0f,1.0f));
texgen->setPlanesFromMatrix(osg::Matrix::inverse(matrix));
stateset->setTextureAttributeAndModes(0, texgen, osg::StateAttribute::ON);