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

Added GLSL shader pathway into osgforest.

Browse Source
This commit is contained in:
Robert Osfield 2005-08-09 09:11:15 +00:00
parent 3af2fc76dc
commit 7cb6bbdfea
1 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
examples/osgforest/osgforest.cpp
View File

@ -15,6 +15,7 @@
#include <osg/Texture2D> #include <osg/Texture2D>
#include <osgDB/ReadFile> #include <osgDB/ReadFile>
#include <osgDB/FileUtils>
#include <osgUtil/IntersectVisitor> #include <osgUtil/IntersectVisitor>
#include <osgUtil/SmoothingVisitor> #include <osgUtil/SmoothingVisitor>
@ -775,16 +776,8 @@ class ShaderGeometry : public osg::Drawable
itr != _trees.end(); itr != _trees.end();
++itr) ++itr)
{ {
#if 0
glColor4fv(itr->ptr()); glColor4fv(itr->ptr());
_geometry->drawImplementation(state); _geometry->draw(state);
#else
glPushMatrix();
glTranslatef((*itr)[0], (*itr)[1], (*itr)[2]);
glScalef( (*itr)[3],(*itr)[3],(*itr)[3] );
_geometry->drawImplementation(state);
glPopMatrix();
#endif
} }
} }
@ -966,7 +959,7 @@ osg::Node* ForestTechniqueManager::createScene(unsigned int numTreesToCreates)
_techniqueSwitch = new osg::Switch; _techniqueSwitch = new osg::Switch;
{ {
std::cout<<"Creating billboard based forest..."; std::cout<<"Creating billboard based forest...";
osg::Group* group = new osg::Group; osg::Group* group = new osg::Group;
@ -993,7 +986,7 @@ osg::Node* ForestTechniqueManager::createScene(unsigned int numTreesToCreates)
_techniqueSwitch->addChild(group); _techniqueSwitch->addChild(group);
std::cout<<"done."<<std::endl; std::cout<<"done."<<std::endl;
} }
{ {
osg::Group* group = new osg::Group; osg::Group* group = new osg::Group;
@ -1004,13 +997,23 @@ osg::Node* ForestTechniqueManager::createScene(unsigned int numTreesToCreates)
stateset->setRenderingHint( osg::StateSet::TRANSPARENT_BIN ); stateset->setRenderingHint( osg::StateSet::TRANSPARENT_BIN );
{ {
osg::Program* program = new osg::Program;
stateset->setAttribute(program);
#if 1
// use inline shaders
/////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////
// vertex shader using just Vec4 coefficients // vertex shader using just Vec4 coefficients
char vertexShaderSource[] = char vertexShaderSource[] =
"void main(void) \n" "varying vec2 texcoord;\n"
"{ \n"
"\n" "\n"
" gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;\n" "void main(void)\n"
"{\n"
" vec3 position = gl_Vertex.xyz * gl_Color.w + gl_Color.xyz;\n"
" gl_Position = gl_ModelViewProjectionMatrix * vec4(position,1.0);\n"
" gl_FrontColor = vec4(1.0,1.0,1.0,1.0);\n"
" texcoord = gl_MultiTexCoord0.st;\n"
"}\n"; "}\n";
////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////
@ -1018,21 +1021,26 @@ osg::Node* ForestTechniqueManager::createScene(unsigned int numTreesToCreates)
// //
char fragmentShaderSource[] = char fragmentShaderSource[] =
"uniform sampler2D baseTexture; \n" "uniform sampler2D baseTexture; \n"
"varying vec2 texcoord; \n"
"\n" "\n"
"void main(void) \n" "void main(void) \n"
"{ \n" "{ \n"
" gl_FragColor = texture2D( baseTexture, gl_TexCoord[0].xy); \n" " gl_FragColor = texture2D( baseTexture, texcoord); \n"
"}\n"; "}\n";
osg::Shader* vertex_shader = new osg::Shader(osg::Shader::VERTEX, vertexShaderSource);
osg::Program* program = new osg::Program; program->addShader(vertex_shader);
stateset->setAttribute(program);
//osg::Shader* vertex_shader = new osg::Shader(osg::Shader::VERTEX, vertexShaderSource);
//program->addShader(vertex_shader);
osg::Shader* fragment_shader = new osg::Shader(osg::Shader::FRAGMENT, fragmentShaderSource); osg::Shader* fragment_shader = new osg::Shader(osg::Shader::FRAGMENT, fragmentShaderSource);
program->addShader(fragment_shader); program->addShader(fragment_shader);
#else
// get shaders from source
program->addShader(osg::Shader::readShaderFile(osg::Shader::VERTEX, osgDB::findDataFile("shaders/forest.vert")));
program->addShader(osg::Shader::readShaderFile(osg::Shader::FRAGMENT, osgDB::findDataFile("shaders/forest.frag")));
#endif
osg::Uniform* baseTextureSampler = new osg::Uniform("baseTexture",0); osg::Uniform* baseTextureSampler = new osg::Uniform("baseTexture",0);
stateset->addUniform(baseTextureSampler); stateset->addUniform(baseTextureSampler);