-// Copyright (C) 2008 - 2009 Tim Moore timoore@redhat.com
+// Copyright (C) 2008 - 2010 Tim Moore timoore33@gmail.com
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Library General Public
#include <osg/Material>
#include <osg/Math>
#include <osg/PolygonMode>
+#include <osg/PolygonOffset>
#include <osg/Program>
#include <osg/Referenced>
#include <osg/RenderInfo>
#include <osgDB/ReadFile>
#include <osgDB/Registry>
-#include <simgear/scene/model/SGReaderWriterXMLOptions.hxx>
+#include <simgear/scene/util/SGReaderWriterOptions.hxx>
#include <simgear/scene/tgdb/userdata.hxx>
+#include <simgear/scene/util/OsgMath.hxx>
#include <simgear/scene/util/SGSceneFeatures.hxx>
#include <simgear/scene/util/StateAttributeFactory.hxx>
#include <simgear/structure/OSGUtils.hxx>
#include <simgear/structure/SGExpression.hxx>
-
+#include <simgear/props/vectorPropTemplates.hxx>
namespace simgear
}
Effect::Effect(const Effect& rhs, const CopyOp& copyop)
- : root(rhs.root), parametersProp(rhs.parametersProp), _cache(0),
+ : osg::Object(rhs,copyop), root(rhs.root), parametersProp(rhs.parametersProp), _cache(0),
_isRealized(rhs._isRealized)
{
typedef vector<ref_ptr<Technique> > TechniqueList;
itr != end;
++itr)
techniques.push_back(static_cast<Technique*>(copyop(itr->get())));
+
+ generator = rhs.generator;
}
// Assume that the last technique is always valid.
return pass;
}
+int Effect::getGenerator(Effect::Generator what) const
+{
+ std::map<Generator,int>::const_iterator it = generator.find(what);
+ if(it == generator.end()) return -1;
+ else return it->second;
+}
+
// There should always be a valid technique in an effect.
Technique* Effect::chooseTechnique(RenderInfo* info)
}
void buildPass(Effect* effect, Technique* tniq, const SGPropertyNode* prop,
- const SGReaderWriterXMLOptions* options)
+ const SGReaderWriterOptions* options)
{
Pass* pass = new Pass;
tniq->passes.push_back(pass);
struct LightingBuilder : public PassAttributeBuilder
{
void buildAttribute(Effect* effect, Pass* pass, const SGPropertyNode* prop,
- const SGReaderWriterXMLOptions* options);
+ const SGReaderWriterOptions* options);
};
void LightingBuilder::buildAttribute(Effect* effect, Pass* pass,
const SGPropertyNode* prop,
- const SGReaderWriterXMLOptions* options)
+ const SGReaderWriterOptions* options)
{
const SGPropertyNode* realProp = getEffectPropertyNode(effect, prop);
if (!realProp)
struct ShadeModelBuilder : public PassAttributeBuilder
{
void buildAttribute(Effect* effect, Pass* pass, const SGPropertyNode* prop,
- const SGReaderWriterXMLOptions* options)
+ const SGReaderWriterOptions* options)
{
const SGPropertyNode* realProp = getEffectPropertyNode(effect, prop);
if (!realProp)
struct CullFaceBuilder : PassAttributeBuilder
{
void buildAttribute(Effect* effect, Pass* pass, const SGPropertyNode* prop,
- const SGReaderWriterXMLOptions* options)
+ const SGReaderWriterOptions* options)
{
const SGPropertyNode* realProp = getEffectPropertyNode(effect, prop);
if (!realProp) {
struct ColorMaskBuilder : PassAttributeBuilder
{
void buildAttribute(Effect* effect, Pass* pass, const SGPropertyNode* prop,
- const SGReaderWriterXMLOptions* options)
+ const SGReaderWriterOptions* options)
{
const SGPropertyNode* realProp = getEffectPropertyNode(effect, prop);
if (!realProp)
ColorMask *mask = new ColorMask;
Vec4 m = getColor(realProp);
- mask->setMask(m.r(), m.g(), m.b(), m.a());
+ mask->setMask(m.r() > 0.0, m.g() > 0.0, m.b() > 0.0, m.a() > 0.0);
pass->setAttributeAndModes(mask);
}
};
struct HintBuilder : public PassAttributeBuilder
{
void buildAttribute(Effect* effect, Pass* pass, const SGPropertyNode* prop,
- const SGReaderWriterXMLOptions* options)
+ const SGReaderWriterOptions* options)
{
const SGPropertyNode* realProp = getEffectPropertyNode(effect, prop);
if (!realProp)
struct RenderBinBuilder : public PassAttributeBuilder
{
void buildAttribute(Effect* effect, Pass* pass, const SGPropertyNode* prop,
- const SGReaderWriterXMLOptions* options)
+ const SGReaderWriterOptions* options)
{
if (!isAttributeActive(effect, prop))
return;
struct MaterialBuilder : public PassAttributeBuilder
{
void buildAttribute(Effect* effect, Pass* pass, const SGPropertyNode* prop,
- const SGReaderWriterXMLOptions* options);
+ const SGReaderWriterOptions* options);
};
EffectNameValue<Material::ColorMode> colorModeInit[] =
void MaterialBuilder::buildAttribute(Effect* effect, Pass* pass,
const SGPropertyNode* prop,
- const SGReaderWriterXMLOptions* options)
+ const SGReaderWriterOptions* options)
{
if (!isAttributeActive(effect, prop))
return;
struct BlendBuilder : public PassAttributeBuilder
{
void buildAttribute(Effect* effect, Pass* pass, const SGPropertyNode* prop,
- const SGReaderWriterXMLOptions* options)
+ const SGReaderWriterOptions* options)
{
if (!isAttributeActive(effect, prop))
return;
struct StencilBuilder : public PassAttributeBuilder
{
void buildAttribute(Effect* effect, Pass* pass, const SGPropertyNode* prop,
- const SGReaderWriterXMLOptions* options)
+ const SGReaderWriterOptions* options)
{
if (!isAttributeActive(effect, prop))
return;
struct AlphaTestBuilder : public PassAttributeBuilder
{
void buildAttribute(Effect* effect, Pass* pass, const SGPropertyNode* prop,
- const SGReaderWriterXMLOptions* options)
+ const SGReaderWriterOptions* options)
{
if (!isAttributeActive(effect, prop))
return;
InstallAttributeBuilder<TextureUnitBuilder> textureUnitBuilder("texture-unit");
// Shader key, used both for shaders with relative and absolute names
-typedef pair<string, Shader::Type> ShaderKey;
+typedef pair<string, int> ShaderKey;
+
+inline ShaderKey makeShaderKey(SGPropertyNode_ptr& ptr, int shaderType)
+{
+ return ShaderKey(ptr->getStringValue(), shaderType);
+}
struct ProgramKey
{
boost::hash<ProgramKey>, ProgramKey::EqualTo>
ProgramMap;
ProgramMap programMap;
+ProgramMap resolvedProgramMap; // map with resolved shader file names
typedef tr1::unordered_map<ShaderKey, ref_ptr<Shader>, boost::hash<ShaderKey> >
ShaderMap;
{
for(ShaderMap::iterator sitr = shaderMap.begin(); sitr != shaderMap.end(); ++sitr)
{
- Shader *shader = sitr->second.get();
- string fileName = osgDB::findDataFile(sitr->first.first);
+ Shader *shader = sitr->second.get();
+ string fileName = SGModelLib::findDataFile(sitr->first.first);
if (!fileName.empty()) {
- shader->loadShaderSourceFromFile(fileName);
+ shader->loadShaderSourceFromFile(fileName);
}
}
}
struct ShaderProgramBuilder : PassAttributeBuilder
{
void buildAttribute(Effect* effect, Pass* pass, const SGPropertyNode* prop,
- const SGReaderWriterXMLOptions* options);
+ const SGReaderWriterOptions* options);
+};
+
+
+EffectNameValue<GLint> geometryInputTypeInit[] =
+{
+ {"points", GL_POINTS},
+ {"lines", GL_LINES},
+ {"lines-adjacency", GL_LINES_ADJACENCY_EXT},
+ {"triangles", GL_TRIANGLES},
+ {"triangles-adjacency", GL_TRIANGLES_ADJACENCY_EXT},
+};
+EffectPropertyMap<GLint>
+geometryInputType(geometryInputTypeInit);
+
+
+EffectNameValue<GLint> geometryOutputTypeInit[] =
+{
+ {"points", GL_POINTS},
+ {"line-strip", GL_LINE_STRIP},
+ {"triangle-strip", GL_TRIANGLE_STRIP}
};
+EffectPropertyMap<GLint>
+geometryOutputType(geometryOutputTypeInit);
void ShaderProgramBuilder::buildAttribute(Effect* effect, Pass* pass,
const SGPropertyNode* prop,
- const SGReaderWriterXMLOptions*
+ const SGReaderWriterOptions*
options)
{
using namespace boost;
if (!isAttributeActive(effect, prop))
return;
PropertyList pVertShaders = prop->getChildren("vertex-shader");
+ PropertyList pGeomShaders = prop->getChildren("geometry-shader");
PropertyList pFragShaders = prop->getChildren("fragment-shader");
PropertyList pAttributes = prop->getChildren("attribute");
ProgramKey prgKey;
- for (PropertyList::iterator itr = pVertShaders.begin(),
- e = pVertShaders.end();
- itr != e;
- ++itr)
- prgKey.shaders.push_back(ShaderKey((*itr)->getStringValue(),
- Shader::VERTEX));
- for (PropertyList::iterator itr = pFragShaders.begin(),
- e = pFragShaders.end();
- itr != e;
- ++itr)
- prgKey.shaders.push_back(ShaderKey((*itr)->getStringValue(),
- Shader::FRAGMENT));
+ std::back_insert_iterator<vector<ShaderKey> > inserter(prgKey.shaders);
+ transform(pVertShaders.begin(), pVertShaders.end(), inserter,
+ boost::bind(makeShaderKey, _1, Shader::VERTEX));
+ transform(pGeomShaders.begin(), pGeomShaders.end(), inserter,
+ boost::bind(makeShaderKey, _1, Shader::GEOMETRY));
+ transform(pFragShaders.begin(), pFragShaders.end(), inserter,
+ boost::bind(makeShaderKey, _1, Shader::FRAGMENT));
for (PropertyList::iterator itr = pAttributes.begin(),
e = pAttributes.end();
itr != e;
ProgramMap::iterator pitr = programMap.find(prgKey);
if (pitr != programMap.end()) {
program = pitr->second.get();
- } else {
- program = new Program;
- // Add vertex shaders, then fragment shaders
- PropertyList& pvec = pVertShaders;
- Shader::Type stype = Shader::VERTEX;
- for (int i = 0; i < 2; ++i) {
- for (PropertyList::iterator nameItr = pvec.begin(), e = pvec.end();
- nameItr != e;
- ++nameItr) {
- string shaderName = (*nameItr)->getStringValue();
- string fileName = osgDB::findDataFile(shaderName, options);
- if (fileName.empty())
- throw BuilderException(string("couldn't find shader ") +
- shaderName);
- ShaderKey skey(fileName, stype);
- ShaderMap::iterator sitr = shaderMap.find(skey);
- if (sitr != shaderMap.end()) {
- program->addShader(sitr->second.get());
- } else {
- ref_ptr<Shader> shader = new Shader(stype);
- if (shader->loadShaderSourceFromFile(fileName)) {
- program->addShader(shader.get());
- shaderMap.insert(ShaderMap::value_type(skey, shader));
- }
- }
+ pass->setAttributeAndModes(program);
+ return;
+ }
+ // The program wasn't in the map using the load path passed in with
+ // the options, but it might have already been loaded using a
+ // different load path i.e., its shaders were found in the fg data
+ // directory. So, resolve the shaders' file names and look in the
+ // resolvedProgramMap for a program using those shaders.
+ ProgramKey resolvedKey;
+ resolvedKey.attributes = prgKey.attributes;
+ BOOST_FOREACH(const ShaderKey& shaderKey, prgKey.shaders)
+ {
+ const string& shaderName = shaderKey.first;
+ Shader::Type stype = (Shader::Type)shaderKey.second;
+ string fileName = SGModelLib::findDataFile(shaderName, options);
+ if (fileName.empty())
+ throw BuilderException(string("couldn't find shader ") +
+ shaderName);
+ resolvedKey.shaders.push_back(ShaderKey(fileName, stype));
+ }
+ ProgramMap::iterator resitr = resolvedProgramMap.find(resolvedKey);
+ if (resitr != resolvedProgramMap.end()) {
+ program = resitr->second.get();
+ programMap.insert(ProgramMap::value_type(prgKey, program));
+ pass->setAttributeAndModes(program);
+ return;
+ }
+ program = new Program;
+ BOOST_FOREACH(const ShaderKey& skey, resolvedKey.shaders)
+ {
+ const string& fileName = skey.first;
+ Shader::Type stype = (Shader::Type)skey.second;
+ ShaderMap::iterator sitr = shaderMap.find(skey);
+ if (sitr != shaderMap.end()) {
+ program->addShader(sitr->second.get());
+ } else {
+ ref_ptr<Shader> shader = new Shader(stype);
+ shader->setName(fileName);
+ if (shader->loadShaderSourceFromFile(fileName)) {
+ program->addShader(shader.get());
+ shaderMap.insert(ShaderMap::value_type(skey, shader));
}
- pvec = pFragShaders;
- stype = Shader::FRAGMENT;
- }
- BOOST_FOREACH(const ProgramKey::AttribKey& key, prgKey.attributes) {
- program->addBindAttribLocation(key.first, key.second);
}
- programMap.insert(ProgramMap::value_type(prgKey, program));
}
+ BOOST_FOREACH(const ProgramKey::AttribKey& key, prgKey.attributes) {
+ program->addBindAttribLocation(key.first, key.second);
+ }
+ const SGPropertyNode* pGeometryVerticesOut
+ = getEffectPropertyChild(effect, prop, "geometry-vertices-out");
+ if (pGeometryVerticesOut)
+ program->setParameter(GL_GEOMETRY_VERTICES_OUT_EXT,
+ pGeometryVerticesOut->getIntValue());
+ const SGPropertyNode* pGeometryInputType
+ = getEffectPropertyChild(effect, prop, "geometry-input-type");
+ if (pGeometryInputType) {
+ GLint type;
+ findAttr(geometryInputType, pGeometryInputType->getStringValue(), type);
+ program->setParameter(GL_GEOMETRY_INPUT_TYPE_EXT, type);
+ }
+ const SGPropertyNode* pGeometryOutputType
+ = getEffectPropertyChild(effect, prop, "geometry-output-type");
+ if (pGeometryOutputType) {
+ GLint type;
+ findAttr(geometryOutputType, pGeometryOutputType->getStringValue(),
+ type);
+ program->setParameter(GL_GEOMETRY_OUTPUT_TYPE_EXT, type);
+ }
+ programMap.insert(ProgramMap::value_type(prgKey, program));
+ resolvedProgramMap.insert(ProgramMap::value_type(resolvedKey, program));
pass->setAttributeAndModes(program);
}
EffectNameValue<Uniform::Type> uniformTypesInit[] =
{
+ {"bool", Uniform::BOOL},
+ {"int", Uniform::INT},
{"float", Uniform::FLOAT},
{"float-vec3", Uniform::FLOAT_VEC3},
{"float-vec4", Uniform::FLOAT_VEC4},
};
EffectPropertyMap<Uniform::Type> uniformTypes(uniformTypesInit);
+// Optimization hack for common uniforms.
+// XXX protect these with a mutex?
+
+ref_ptr<Uniform> texture0;
+ref_ptr<Uniform> colorMode[3];
+
struct UniformBuilder :public PassAttributeBuilder
{
void buildAttribute(Effect* effect, Pass* pass, const SGPropertyNode* prop,
- const SGReaderWriterXMLOptions* options)
+ const SGReaderWriterOptions* options)
{
+ if (!texture0.valid()) {
+ texture0 = new Uniform(Uniform::SAMPLER_2D, "texture");
+ texture0->set(0);
+ texture0->setDataVariance(Object::STATIC);
+ for (int i = 0; i < 3; ++i) {
+ colorMode[i] = new Uniform(Uniform::INT, "colorMode");
+ colorMode[i]->set(i);
+ colorMode[i]->setDataVariance(Object::STATIC);
+ }
+ }
if (!isAttributeActive(effect, prop))
return;
const SGPropertyNode* nameProp = prop->getChild("name");
const SGPropertyNode* typeProp = prop->getChild("type");
+ const SGPropertyNode* positionedProp = prop->getChild("positioned");
const SGPropertyNode* valProp = prop->getChild("value");
string name;
Uniform::Type uniformType = Uniform::FLOAT;
if (!typeProp) {
props::Type propType = valProp->getType();
switch (propType) {
+ case props::BOOL:
+ uniformType = Uniform::BOOL;
+ break;
+ case props::INT:
+ uniformType = Uniform::INT;
+ break;
case props::FLOAT:
case props::DOUBLE:
break; // default float type;
uniform->setName(name);
uniform->setType(uniformType);
switch (uniformType) {
+ case Uniform::BOOL:
+ initFromParameters(effect, valProp, uniform.get(),
+ static_cast<bool (Uniform::*)(bool)>(&Uniform::set),
+ options);
+ break;
case Uniform::FLOAT:
initFromParameters(effect, valProp, uniform.get(),
static_cast<bool (Uniform::*)(float)>(&Uniform::set),
static_cast<bool (Uniform::*)(const Vec4&)>(&Uniform::set),
vec4Names, options);
break;
+ case Uniform::INT:
case Uniform::SAMPLER_1D:
case Uniform::SAMPLER_2D:
case Uniform::SAMPLER_3D:
default: // avoid compiler warning
break;
}
+ // optimize common uniforms
+ if (uniformType == Uniform::SAMPLER_2D || uniformType == Uniform::INT)
+ {
+ int val = 0;
+ uniform->get(val); // 'val' remains unchanged in case of error (Uniform is a non-scalar)
+ if (uniformType == Uniform::SAMPLER_2D && val == 0
+ && name == "texture") {
+ uniform = texture0;
+ } else if (uniformType == Uniform::INT && val >= 0 && val < 3
+ && name == "colorMode") {
+ uniform = colorMode[val];
+ }
+ }
pass->addUniform(uniform.get());
+ if (positionedProp && positionedProp->getBoolValue() && uniformType == Uniform::FLOAT_VEC4) {
+ osg::Vec4 offset;
+ uniform->get(offset);
+ pass->addPositionedUniform( name, offset );
+ }
}
};
struct NameBuilder : public PassAttributeBuilder
{
void buildAttribute(Effect* effect, Pass* pass, const SGPropertyNode* prop,
- const SGReaderWriterXMLOptions* options)
+ const SGReaderWriterOptions* options)
{
// name can't use <use>
string name = prop->getStringValue();
struct PolygonModeBuilder : public PassAttributeBuilder
{
void buildAttribute(Effect* effect, Pass* pass, const SGPropertyNode* prop,
- const SGReaderWriterXMLOptions* options)
+ const SGReaderWriterOptions* options)
{
if (!isAttributeActive(effect, prop))
return;
InstallAttributeBuilder<PolygonModeBuilder> installPolygonMode("polygon-mode");
+struct PolygonOffsetBuilder : public PassAttributeBuilder
+{
+ void buildAttribute(Effect* effect, Pass* pass, const SGPropertyNode* prop,
+ const SGReaderWriterOptions* options)
+ {
+ if (!isAttributeActive(effect, prop))
+ return;
+
+ const SGPropertyNode* factor
+ = getEffectPropertyChild(effect, prop, "factor");
+ const SGPropertyNode* units
+ = getEffectPropertyChild(effect, prop, "units");
+
+ ref_ptr<PolygonOffset> polyoffset = new PolygonOffset;
+
+ polyoffset->setFactor(factor->getFloatValue());
+ polyoffset->setUnits(units->getFloatValue());
+
+ SG_LOG(SG_INPUT, SG_BULK,
+ "Set PolygonOffset to " << polyoffset->getFactor() << polyoffset->getUnits() );
+
+ pass->setAttributeAndModes(polyoffset.get(),
+ StateAttribute::OVERRIDE|StateAttribute::ON);
+ }
+};
+
+InstallAttributeBuilder<PolygonOffsetBuilder> installPolygonOffset("polygon-offset");
+
struct VertexProgramTwoSideBuilder : public PassAttributeBuilder
{
void buildAttribute(Effect* effect, Pass* pass, const SGPropertyNode* prop,
- const SGReaderWriterXMLOptions* options)
+ const SGReaderWriterOptions* options)
{
const SGPropertyNode* realProp = getEffectPropertyNode(effect, prop);
if (!realProp)
struct VertexProgramPointSizeBuilder : public PassAttributeBuilder
{
void buildAttribute(Effect* effect, Pass* pass, const SGPropertyNode* prop,
- const SGReaderWriterXMLOptions* options)
+ const SGReaderWriterOptions* options)
{
const SGPropertyNode* realProp = getEffectPropertyNode(effect, prop);
if (!realProp)
struct DepthBuilder : public PassAttributeBuilder
{
void buildAttribute(Effect* effect, Pass* pass, const SGPropertyNode* prop,
- const SGReaderWriterXMLOptions* options)
+ const SGReaderWriterOptions* options)
{
if (!isAttributeActive(effect, prop))
return;
const SGPropertyNode* pfar
= getEffectPropertyChild(effect, prop, "far");
if (pfar)
- depth->setZFar(pnear->getValue<double>());
+ depth->setZFar(pfar->getValue<double>());
const SGPropertyNode* pmask
= getEffectPropertyChild(effect, prop, "write-mask");
if (pmask)
depth->setWriteMask(pmask->getValue<bool>());
- pass->setAttribute(depth.get());
+ const SGPropertyNode* penabled
+ = getEffectPropertyChild(effect, prop, "enabled");
+ bool enabled = ( penabled == 0 || penabled->getBoolValue() );
+ pass->setAttributeAndModes(depth.get(), enabled ? osg::StateAttribute::ON : osg::StateAttribute::OFF);
}
};
InstallAttributeBuilder<DepthBuilder> installDepth("depth");
void buildTechnique(Effect* effect, const SGPropertyNode* prop,
- const SGReaderWriterXMLOptions* options)
+ const SGReaderWriterOptions* options)
{
Technique* tniq = new Technique;
effect->techniques.push_back(tniq);
}
}
makeChild(paramRoot, "cull-face")->setStringValue(cullFaceString);
+ // Macintosh ATI workaround
+ bool vertexTwoSide = cullFaceString == "off";
+ makeChild(paramRoot, "vertex-program-two-side")->setValue(vertexTwoSide);
const BlendFunc* blendFunc = getStateAttribute<BlendFunc>(ss);
SGPropertyNode* blendNode = makeChild(paramRoot, "blend");
if (blendFunc) {
// Walk the techniques property tree, building techniques and
// passes.
-bool Effect::realizeTechniques(const SGReaderWriterXMLOptions* options)
+bool Effect::realizeTechniques(const SGReaderWriterOptions* options)
{
if (_isRealized)
return true;
}
// Property expressions for technique predicates
-class PropertyExpression : public SGExpression<bool>
+template<typename T>
+class PropertyExpression : public SGExpression<T>
{
public:
PropertyExpression(SGPropertyNode* pnode) : _pnode(pnode) {}
- void eval(bool& value, const expression::Binding*) const
+ void eval(T& value, const expression::Binding*) const
{
- value = _pnode->getValue<bool>();
+ value = _pnode->getValue<T>();
}
protected:
SGPropertyNode_ptr _pnode;
void valueChanged(SGPropertyNode* node)
{
- _tniq->refreshValidity();
+ if (_tniq.valid())
+ _tniq->refreshValidity();
}
protected:
- osg::ref_ptr<Technique> _tniq;
+ osg::observer_ptr<Technique> _tniq;
};
+template<typename T>
Expression* propertyExpressionParser(const SGPropertyNode* exp,
expression::Parser* parser)
{
SGPropertyNode_ptr pnode = getPropertyRoot()->getNode(exp->getStringValue(),
true);
- PropertyExpression* pexp = new PropertyExpression(pnode);
+ PropertyExpression<T>* pexp = new PropertyExpression<T>(pnode);
TechniquePredParser* predParser
= dynamic_cast<TechniquePredParser*>(parser);
if (predParser)
}
expression::ExpParserRegistrar propertyRegistrar("property",
- propertyExpressionParser);
+ propertyExpressionParser<bool>);
+
+expression::ExpParserRegistrar propvalueRegistrar("float-property",
+ propertyExpressionParser<float>);
}
projects / simgear.git / blobdiff