#include <osg/Texture2D>
#include <osg/Texture3D>
#include <osg/TextureRectangle>
+#include <osg/TextureCubeMap>
#include <osgDB/FileUtils>
#include <boost/lexical_cast.hpp>
#include <boost/tuple/tuple.hpp>
#include <boost/tuple/tuple_comparison.hpp>
+#include <simgear/scene/model/SGReaderWriterXMLOptions.hxx>
#include <simgear/scene/util/SGSceneFeatures.hxx>
#include <simgear/scene/util/StateAttributeFactory.hxx>
#include <simgear/math/SGMath.hxx>
using namespace effect;
TexEnvCombine* buildTexEnvCombine(Effect* effect,
- const SGPropertyNode* envProp);
+ const SGPropertyNode* envProp,
+ const SGReaderWriterXMLOptions* options);
TexGen* buildTexGen(Effect* Effect, const SGPropertyNode* tgenProp);
// Hack to force inclusion of TextureBuilder.cxx in library
osg::Texture* TextureBuilder::buildFromType(Effect* effect, const string& type,
const SGPropertyNode*props,
- const osgDB::ReaderWriter::Options*
+ const SGReaderWriterXMLOptions*
options)
{
return EffectBuilder<Texture>::buildFromType(effect, type, props, options);
if (colorProp)
env->setColor(toOsg(colorProp->getValue<SGVec4d>()));
return env;
- }
+}
void TextureUnitBuilder::buildAttribute(Effect* effect, Pass* pass,
const SGPropertyNode* prop,
- const osgDB::ReaderWriter::Options* options)
+ const SGReaderWriterXMLOptions* options)
{
if (!isAttributeActive(effect, prop))
return;
options);
}
catch (BuilderException& e) {
- SG_LOG(SG_INPUT, SG_ALERT, "No image file for texture, using white ");
+ SG_LOG(SG_INPUT, SG_ALERT, "No image file, "
+ << "maybe the reader did not set the filename attribute, "
+ << "using white on " << pass->getName());
texture = StateAttributeFactory::instance()->getWhiteTexture();
}
pass->setTextureAttributeAndModes(unit, texture);
}
const SGPropertyNode* combineProp = prop->getChild("texenv-combine");
TexEnvCombine* combiner = 0;
- if (combineProp && ((combiner = buildTexEnvCombine(effect, combineProp))))
+ if (combineProp && ((combiner = buildTexEnvCombine(effect, combineProp,
+ options))))
pass->setTextureAttributeAndModes(unit, combiner);
const SGPropertyNode* tgenProp = prop->getChild("texgen");
TexGen* tgen = 0;
TexTuple makeTexTuple(Effect* effect, const SGPropertyNode* props,
- const osgDB::ReaderWriter::Options* options,
+ const SGReaderWriterXMLOptions* options,
const string& texType)
{
Texture::FilterMode minFilter = Texture::LINEAR_MIPMAP_LINEAR;
- findAttr(filterModes, getEffectPropertyChild(effect, props, "filter"),
- minFilter);
+ const SGPropertyNode* ep = 0;
+ if ((ep = getEffectPropertyChild(effect, props, "filter")))
+ findAttr(filterModes, ep, minFilter);
Texture::FilterMode magFilter = Texture::LINEAR;
- findAttr(filterModes, getEffectPropertyChild(effect, props,
- "mag-filter"),
- magFilter);
+ if ((ep = getEffectPropertyChild(effect, props, "mag-filter")))
+ findAttr(filterModes, ep, magFilter);
const SGPropertyNode* pWrapS
= getEffectPropertyChild(effect, props, "wrap-s");
Texture::WrapMode sWrap = Texture::CLAMP;
- findAttr(wrapModes, pWrapS, sWrap);
+ if (pWrapS)
+ findAttr(wrapModes, pWrapS, sWrap);
const SGPropertyNode* pWrapT
= getEffectPropertyChild(effect, props, "wrap-t");
Texture::WrapMode tWrap = Texture::CLAMP;
- findAttr(wrapModes, pWrapT, tWrap);
+ if (pWrapT)
+ findAttr(wrapModes, pWrapT, tWrap);
const SGPropertyNode* pWrapR
= getEffectPropertyChild(effect, props, "wrap-r");
Texture::WrapMode rWrap = Texture::CLAMP;
- findAttr(wrapModes, pWrapR, rWrap);
+ if (pWrapR)
+ findAttr(wrapModes, pWrapR, rWrap);
const SGPropertyNode* pImage
= getEffectPropertyChild(effect, props, "image");
string imageName;
}
void setAttrs(const TexTuple& attrs, Texture* tex,
- const osgDB::ReaderWriter::Options* options)
+ const SGReaderWriterXMLOptions* options)
{
const string& imageName = attrs.get<0>();
if (imageName.empty()) {
public:
TexBuilder(const string& texType) : _type(texType) {}
Texture* build(Effect* effect, const SGPropertyNode*,
- const osgDB::ReaderWriter::Options* options);
+ const SGReaderWriterXMLOptions* options);
protected:
typedef map<TexTuple, ref_ptr<T> > TexMap;
TexMap texMap;
template<typename T>
Texture* TexBuilder<T>::build(Effect* effect, const SGPropertyNode* props,
- const osgDB::ReaderWriter::Options* options)
+ const SGReaderWriterXMLOptions* options)
{
TexTuple attrs = makeTexTuple(effect, props, options, _type);
typename TexMap::iterator itr = texMap.find(attrs);
{
public:
Texture* build(Effect* effect, const SGPropertyNode*,
- const osgDB::ReaderWriter::Options* options);
+ const SGReaderWriterXMLOptions* options);
};
Texture* WhiteTextureBuilder::build(Effect* effect, const SGPropertyNode*,
- const osgDB::ReaderWriter::Options* options)
+ const SGReaderWriterXMLOptions* options)
{
return StateAttributeFactory::instance()->getWhiteTexture();
}
{
public:
Texture* build(Effect* effect, const SGPropertyNode*,
- const osgDB::ReaderWriter::Options* options);
+ const SGReaderWriterXMLOptions* options);
};
Texture* TransparentTextureBuilder::build(Effect* effect, const SGPropertyNode*,
- const osgDB::ReaderWriter::Options* options)
+ const SGReaderWriterXMLOptions* options)
{
return StateAttributeFactory::instance()->getTransparentTexture();
}
{
public:
Texture* build(Effect* effect, const SGPropertyNode*,
- const osgDB::ReaderWriter::Options* options);
+ const SGReaderWriterXMLOptions* options);
protected:
typedef map<int, ref_ptr<Texture3D> > NoiseMap;
NoiseMap _noises;
};
Texture* NoiseBuilder::build(Effect* effect, const SGPropertyNode* props,
- const osgDB::ReaderWriter::Options* options)
+ const SGReaderWriterXMLOptions* options)
{
int texSize = 64;
const SGPropertyNode* sizeProp = getEffectPropertyChild(effect, props,
TextureBuilder::Registrar installNoise("noise", new NoiseBuilder);
}
+
+// Image names for all sides
+typedef boost::tuple<string, string, string, string, string, string> CubeMapTuple;
+
+CubeMapTuple makeCubeMapTuple(Effect* effect, const SGPropertyNode* props)
+{
+ const SGPropertyNode* ep = 0;
+
+ string positive_x;
+ if ((ep = getEffectPropertyChild(effect, props, "positive-x")))
+ positive_x = ep->getStringValue();
+ string negative_x;
+ if ((ep = getEffectPropertyChild(effect, props, "negative-x")))
+ negative_x = ep->getStringValue();
+ string positive_y;
+ if ((ep = getEffectPropertyChild(effect, props, "positive-y")))
+ positive_y = ep->getStringValue();
+ string negative_y;
+ if ((ep = getEffectPropertyChild(effect, props, "negative-y")))
+ negative_y = ep->getStringValue();
+ string positive_z;
+ if ((ep = getEffectPropertyChild(effect, props, "positive-z")))
+ positive_z = ep->getStringValue();
+ string negative_z;
+ if ((ep = getEffectPropertyChild(effect, props, "negative-z")))
+ negative_z = ep->getStringValue();
+ return CubeMapTuple(positive_x, negative_x, positive_y, negative_y, positive_z, negative_z);
+}
+
+
+class CubeMapBuilder : public TextureBuilder
+{
+public:
+ Texture* build(Effect* effect, const SGPropertyNode*,
+ const SGReaderWriterXMLOptions* options);
+protected:
+ typedef map<CubeMapTuple, ref_ptr<TextureCubeMap> > CubeMap;
+ CubeMap _cubemaps;
+};
+
+Texture* CubeMapBuilder::build(Effect* effect, const SGPropertyNode* props,
+ const SGReaderWriterXMLOptions* options)
+{
+ // First check that there is a <images> tag
+ const SGPropertyNode* texturesProp = getEffectPropertyChild(effect, props, "images");
+ if (!texturesProp) {
+ throw BuilderException("no <images> for cube map");
+ return NULL; // This is redundant
+ }
+
+ CubeMapTuple _tuple = makeCubeMapTuple(effect, texturesProp);
+
+ CubeMap::iterator itr = _cubemaps.find(_tuple);
+ if (itr != _cubemaps.end())
+ return itr->second.get();
+
+ TextureCubeMap* cubeTexture = new osg::TextureCubeMap;
+
+ // TODO: Read these from effect file? Maybe these are sane for all cuebmaps?
+ cubeTexture->setFilter(osg::Texture3D::MIN_FILTER, osg::Texture::LINEAR_MIPMAP_LINEAR);
+ cubeTexture->setFilter(osg::Texture3D::MAG_FILTER, osg::Texture::LINEAR);
+ cubeTexture->setWrap(osg::Texture3D::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
+ cubeTexture->setWrap(osg::Texture3D::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
+ cubeTexture->setWrap(osg::Texture3D::WRAP_R, osg::Texture::CLAMP_TO_EDGE);
+
+ osgDB::ReaderWriter::ReadResult result =
+ osgDB::Registry::instance()->readImage(_tuple.get<0>(), options);
+ if(result.success()) {
+ osg::Image* image = result.getImage();
+ cubeTexture->setImage(TextureCubeMap::POSITIVE_X, image);
+ }
+ result = osgDB::Registry::instance()->readImage(_tuple.get<1>(), options);
+ if(result.success()) {
+ osg::Image* image = result.getImage();
+ cubeTexture->setImage(TextureCubeMap::NEGATIVE_X, image);
+ }
+ result = osgDB::Registry::instance()->readImage(_tuple.get<2>(), options);
+ if(result.success()) {
+ osg::Image* image = result.getImage();
+ cubeTexture->setImage(TextureCubeMap::POSITIVE_Y, image);
+ }
+ result = osgDB::Registry::instance()->readImage(_tuple.get<3>(), options);
+ if(result.success()) {
+ osg::Image* image = result.getImage();
+ cubeTexture->setImage(TextureCubeMap::NEGATIVE_Y, image);
+ }
+ result = osgDB::Registry::instance()->readImage(_tuple.get<4>(), options);
+ if(result.success()) {
+ osg::Image* image = result.getImage();
+ cubeTexture->setImage(TextureCubeMap::POSITIVE_Z, image);
+ }
+ result = osgDB::Registry::instance()->readImage(_tuple.get<5>(), options);
+ if(result.success()) {
+ osg::Image* image = result.getImage();
+ cubeTexture->setImage(TextureCubeMap::NEGATIVE_Z, image);
+ }
+
+ _cubemaps[_tuple] = cubeTexture;
+
+ return cubeTexture;
+}
+
+namespace {
+TextureBuilder::Registrar installCubeMap("cubemap", new CubeMapBuilder);
+}
+
+
+
EffectNameValue<TexEnvCombine::CombineParam> combineParamInit[] =
{
{"replace", TexEnvCombine::REPLACE},
EffectNameValue<TexEnvCombine::OperandParam> opParamInit[] =
{
- {"src_color", TexEnvCombine::SRC_COLOR},
- {"one_minus_src_color", TexEnvCombine::ONE_MINUS_SRC_COLOR},
- {"src_alpha", TexEnvCombine::SRC_ALPHA},
- {"one_minus_src_alpha", TexEnvCombine::ONE_MINUS_SRC_ALPHA}
+ {"src-color", TexEnvCombine::SRC_COLOR},
+ {"one-minus-src-color", TexEnvCombine::ONE_MINUS_SRC_COLOR},
+ {"src-alpha", TexEnvCombine::SRC_ALPHA},
+ {"one-minus-src-alpha", TexEnvCombine::ONE_MINUS_SRC_ALPHA}
};
EffectPropertyMap<TexEnvCombine::OperandParam> operandParams(opParamInit);
-TexEnvCombine* buildTexEnvCombine(Effect* effect, const SGPropertyNode* envProp)
+TexEnvCombine* buildTexEnvCombine(Effect* effect, const SGPropertyNode* envProp,
+ const SGReaderWriterXMLOptions* options)
{
if (!isAttributeActive(effect, envProp))
return 0;
const SGPropertyNode* colorNode = envProp->getChild("constant-color");
if (colorNode)
initFromParameters(effect, colorNode, result,
- &TexEnvCombine::setConstantColor, colorFields);
+ &TexEnvCombine::setConstantColor, colorFields,
+ options);
return result;
}
if (!isAttributeActive(effect, tgenProp))
return 0;
TexGen* result = new TexGen;
- const SGPropertyNode* p = 0;
TexGen::Mode mode = TexGen::OBJECT_LINEAR;
- if (findAttr(tgenModes, getEffectPropertyChild(effect, tgenProp, "mode"),
- mode))
- result->setMode(mode);
+ findAttr(tgenModes, getEffectPropertyChild(effect, tgenProp, "mode"), mode);
+ result->setMode(mode);
const SGPropertyNode* planesNode = tgenProp->getChild("planes");
if (planesNode) {
for (int i = 0; i < planesNode->nChildren(); ++i) {
const SGPropertyNode* planeNode = planesNode->getChild(i);
TexGen::Coord coord;
- if (!findAttr(tgenCoords, planeNode->getName(), coord)) {
- SG_LOG(SG_INPUT, SG_ALERT, "Unknown TexGen plane "
- << planeNode->getName());
- } else {
- const SGPropertyNode* realNode
- = getEffectPropertyNode(effect, planeNode);
- SGVec4d plane = realNode->getValue<SGVec4d>();
- result->setPlane(coord, toOsg(plane));
- }
+ findAttr(tgenCoords, planeNode->getName(), coord);
+ const SGPropertyNode* realNode
+ = getEffectPropertyNode(effect, planeNode);
+ SGVec4d plane = realNode->getValue<SGVec4d>();
+ result->setPlane(coord, toOsg(plane));
}
}
return result;
}
makeChild(texUnit, "active")->setValue(true);
makeChild(texUnit, "type")->setValue("2d");
+ string filter = findName(filterModes,
+ texture->getFilter(Texture::MIN_FILTER));
+ string magFilter = findName(filterModes,
+ texture->getFilter(Texture::MAG_FILTER));
string wrapS = findName(wrapModes, texture->getWrap(Texture::WRAP_S));
string wrapT = findName(wrapModes, texture->getWrap(Texture::WRAP_T));
string wrapR = findName(wrapModes, texture->getWrap(Texture::WRAP_R));
makeChild(texUnit, "image")->setStringValue(imageName);
+ makeChild(texUnit, "filter")->setStringValue(filter);
+ makeChild(texUnit, "mag-filter")->setStringValue(magFilter);
makeChild(texUnit, "wrap-s")->setStringValue(wrapS);
makeChild(texUnit, "wrap-t")->setStringValue(wrapT);
makeChild(texUnit, "wrap-r")->setStringValue(wrapR);
projects / simgear.git / blobdiff