#include <simgear/debug/logstream.hxx>
#include <simgear/math/sg_types.hxx>
+#include <simgear/scene/material/Effect.hxx>
+#include <simgear/scene/material/EffectGeode.hxx>
#include <simgear/scene/material/mat.hxx>
#include <simgear/scene/material/matlib.hxx>
#define SIGN "OBJECT_SIGN: "
#define RWY "OBJECT_RUNWAY_SIGN: "
-SG_USING_STD(vector);
+using std::vector;
+using namespace simgear;
// for temporary storage of sign elements
struct element_info {
- element_info(SGMaterial *m, osg::StateSet *s, SGMaterialGlyph *g, double h)
+ element_info(SGMaterial *m, Effect *s, SGMaterialGlyph *g, double h)
: material(m), state(s), glyph(g), height(h)
{
scale = h * m->get_xsize()
/ (m->get_ysize() < 0.001 ? 1.0 : m->get_ysize());
}
SGMaterial *material;
- osg::StateSet *state;
+ Effect *state;
SGMaterialGlyph *glyph;
double height;
double scale;
const char *keyword;
const char *glyph_name;
} cmds[] = {
- {"@u", "up"},
- {"@d", "down"},
- {"@l", "left"},
- {"@lu", "left-up"},
- {"@ul", "left-up"},
- {"@ld", "left-down"},
- {"@dl", "left-down"},
- {"@r", "right"},
- {"@ru", "right-up"},
- {"@ur", "right-up"},
- {"@rd", "right-down"},
- {"@dr", "right-down"},
+ {"@u", "^u"},
+ {"@d", "^d"},
+ {"@l", "^l"},
+ {"@lu", "^lu"},
+ {"@ul", "^lu"},
+ {"@ld", "^ld"},
+ {"@dl", "^ld"},
+ {"@r", "^r"},
+ {"@ru", "^ru"},
+ {"@ur", "^ru"},
+ {"@rd", "^rd"},
+ {"@dr", "^rd"},
{0, 0},
};
osg::Group* object = new osg::Group;
object->setName(content);
- SGMaterial *material;
- osg::StateSet *lighted_state;
- osg::StateSet *unlighted_state;
+ SGMaterial *material = 0;
+ Effect *lighted_state = 0;
+ Effect *unlighted_state = 0;
// Part I: parse & measure
for (const char *s = content.data(); *s; s++) {
}
if (newmat.size()) {
- material = matlib->find(newmat);
- if (!material) {
+ SGMaterial *m = matlib->find(newmat);
+ if (!m) {
+ // log error, but keep using previous material to at least show something
SG_LOG(SG_TERRAIN, SG_ALERT, SIGN "ignoring unknown material `" << newmat << '\'');
- continue;
- }
-
- // set material states (lighted & unlighted)
- lighted_state = material->get_state();
- string u = newmat + ".unlighted";
-
- SGMaterial *m = matlib->find(u);
- if (m) {
- unlighted_state = m->get_state();
} else {
- SG_LOG(SG_TERRAIN, SG_ALERT, SIGN "ignoring unknown material `" << u << '\'');
- unlighted_state = lighted_state;
+ material = m;
+ // set material states (lighted & unlighted)
+ lighted_state = material->get_effect();
+ newmat.append(".unlighted");
+
+ m = matlib->find(newmat);
+ if (m) {
+ unlighted_state = m->get_effect();
+ } else {
+ SG_LOG(SG_TERRAIN, SG_ALERT, SIGN "ignoring unknown material `" << newmat << '\'');
+ unlighted_state = lighted_state;
+ }
}
- newmat = "";
+ newmat.clear();
}
+ // This can only happen if the default material is missing.
+ // Error has been already logged in the block above.
+ if (!material) continue;
+
SGMaterialGlyph *glyph = material->get_glyph(name);
if (!glyph) {
SG_LOG( SG_TERRAIN, SG_ALERT, SIGN "unsupported glyph `" << *s << '\'');
}
// in managed mode push frame stop and frame start first
- osg::StateSet *state = lighted ? lighted_state : unlighted_state;
+ Effect *state = lighted ? lighted_state : unlighted_state;
element_info *e;
if (newtype && newtype != oldtype) {
if (close) {
geometry->setColorBinding(osg::Geometry::BIND_OVERALL);
geometry->setTexCoordArray(0, tl);
geometry->addPrimitiveSet(new osg::DrawArrays(GL_TRIANGLE_STRIP, 0, vl->size()));
- osg::Geode* geode = new osg::Geode;
+ EffectGeode* geode = new EffectGeode;
geode->addDrawable(geometry);
- geode->setStateSet(element->state);
+ geode->setEffect(element->state);
object->addChild(geode);
hpos += abswidth;
vl->push_back(osg::Vec3(0, hpos, dist + sign_height));
vl->push_back(osg::Vec3(0, hpos - total_width, dist + sign_height));
+ osg::Vec2Array* tl = new osg::Vec2Array;
+ for (int i = 0; i < 4; ++i)
+ tl->push_back(osg::Vec2(0.0, 0.0));
osg::Vec3Array* nl = new osg::Vec3Array;
nl->push_back(osg::Vec3(0, 1, 0));
-
+ osg::Vec4Array* cl = new osg::Vec4Array;
+ cl->push_back(osg::Vec4(0.0, 0.0, 0.0, 1.0));
osg::Geometry* geometry = new osg::Geometry;
geometry->setVertexArray(vl);
geometry->setNormalArray(nl);
geometry->setNormalBinding(osg::Geometry::BIND_OVERALL);
+ geometry->setTexCoordArray(0, tl);
+ geometry->setColorArray(cl);
+ geometry->setColorBinding(osg::Geometry::BIND_OVERALL);
geometry->addPrimitiveSet(new osg::DrawArrays(GL_TRIANGLE_STRIP, 0, vl->size()));
- osg::Geode* geode = new osg::Geode;
+ EffectGeode* geode = new EffectGeode;
geode->addDrawable(geometry);
SGMaterial *mat = matlib->find("BlackSign");
if (mat)
- geode->setStateSet(mat->get_state());
+ geode->setEffect(mat->get_effect());
object->addChild(geode);
return object;
osg::Vec3 heightVec(0, 0, 1);
osg::Geometry* geometry;
geometry = osg::createTexturedQuadGeometry(corner, widthVec, heightVec);
-
- SGMaterial *mat = matlib->find(name);
- if (mat)
- geometry->setStateSet(mat->get_state());
-
- osg::Geode* geode = new osg::Geode;
+ EffectGeode* geode = new EffectGeode;
geode->setName(name);
geode->addDrawable(geometry);
+ SGMaterial *mat = matlib->find(name);
+ if (mat)
+ geode->setEffect(mat->get_effect());
return geode;
}
projects / simgear.git / blobdiff