The attached two files (from src/osgPlugins/lwo) fix a signed/unsigned mismatch warning under VC 7.1 on Windows XP.
They come from osg 2.5.5
Ciao!
               mario

--
Ing. Mario Valle
Data Analysis and Visualization Services         | http://www.cscs.ch/~mvalle
Swiss National Supercomputing Centre (CSCS)      | Tel:  +41 (91) 610.82.60
v. Cantonale Galleria 2, 6928 Manno, Switzerland | Fax:  +41 (91) 610.82.82


/*******************************************************
      Lightwave Object Loader for OSG

  Copyright (C) 2004 Marco Jez <[EMAIL PROTECTED]>
  OpenSceneGraph is (C) 2004 Robert Osfield
********************************************************/

#include "Surface.h"

#include <osg/Material>
#include <osg/CullFace>
#include <osg/Texture2D>
#include <osg/TexEnvCombine>
#include <osg/TexGen>
#include <osg/BlendFunc>
#include <osg/Notify>

#include <osgFX/SpecularHighlights>

#include <osgDB/ReadFile>

using namespace lwosg;

namespace
{

    osg::Texture::WrapMode osg_wrap_mode(Image_map::Wrap_type w)
    {
        switch (w) {
            case Image_map::RESET: return osg::Texture::CLAMP;
            case Image_map::REPEAT: return osg::Texture::REPEAT;
            case Image_map::MIRROR: return osg::Texture::MIRROR;
            case Image_map::EDGE: return osg::Texture::CLAMP_TO_EDGE;
            default: return osg::Texture::REPEAT;
        };
    }

}

Surface::Surface()
:    base_color_(0.784f, 0.784f, 0.784f),
    diffuse_(1.0f),
    luminosity_(0),
    specularity_(0),
    reflection_(0),
    transparency_(0),
    translucency_(0),
    glossiness_(0.4f),
    sidedness_(FRONT_ONLY),
    max_smoothing_angle_(0)
{
}

Surface::Surface(const lwo2::FORM::SURF *surf, const Clip_map &clips)
:    base_color_(0.784f, 0.784f, 0.784f),
    diffuse_(1.0f),
    luminosity_(0),
    specularity_(0),
    reflection_(0),
    transparency_(0),
    translucency_(0),
    glossiness_(0.4f),
    sidedness_(FRONT_ONLY),
    max_smoothing_angle_(0)
{
    compile(surf, clips);
}

void Surface::compile(const lwo2::FORM::SURF *surf, const Clip_map &clips)
{
    // invalidate the stateset so it will be rebuilt
    stateset_ = 0;

    name_ = surf->name;

    for (iff::Chunk_list::const_iterator j=surf->attributes.begin(); 
j!=surf->attributes.end(); ++j) {

        const lwo2::FORM::SURF::COLR *colr = dynamic_cast<const 
lwo2::FORM::SURF::COLR *>(*j);
        if (colr) base_color_ = osg::Vec3(colr->base_color.red, 
colr->base_color.green, colr->base_color.blue);

        const lwo2::FORM::SURF::DIFF *diff = dynamic_cast<const 
lwo2::FORM::SURF::DIFF *>(*j);
        if (diff) diffuse_ = diff->intensity.fraction;

        const lwo2::FORM::SURF::LUMI *lumi = dynamic_cast<const 
lwo2::FORM::SURF::LUMI *>(*j);
        if (lumi) luminosity_ = lumi->intensity.fraction;

        const lwo2::FORM::SURF::SPEC *spec = dynamic_cast<const 
lwo2::FORM::SURF::SPEC *>(*j);
        if (spec) specularity_ = spec->intensity.fraction;

        const lwo2::FORM::SURF::REFL *refl = dynamic_cast<const 
lwo2::FORM::SURF::REFL *>(*j);
        if (refl) reflection_ = refl->intensity.fraction;

        const lwo2::FORM::SURF::TRAN *tran = dynamic_cast<const 
lwo2::FORM::SURF::TRAN *>(*j);
        if (tran) transparency_ = tran->intensity.fraction;

        const lwo2::FORM::SURF::TRNL *trnl = dynamic_cast<const 
lwo2::FORM::SURF::TRNL *>(*j);
        if (trnl) translucency_ = trnl->intensity.fraction;

        const lwo2::FORM::SURF::GLOS *glos = dynamic_cast<const 
lwo2::FORM::SURF::GLOS *>(*j);
        if (glos) glossiness_ = glos->glossiness.fraction;

        const lwo2::FORM::SURF::SIDE *side = dynamic_cast<const 
lwo2::FORM::SURF::SIDE *>(*j);
        if (side) sidedness_ = static_cast<Sidedness>(side->sidedness);

        const lwo2::FORM::SURF::SMAN *sman = dynamic_cast<const 
lwo2::FORM::SURF::SMAN *>(*j);
        if (sman) max_smoothing_angle_ = sman->max_smoothing_angle.radians;

        const lwo2::FORM::SURF::VCOL *vcol = dynamic_cast<const 
lwo2::FORM::SURF::VCOL *>(*j);
        if (vcol) {
            color_map_intensity_ = vcol->intensity.fraction;
            color_map_type_ = std::string(vcol->vmap_type.id, 4);
            color_map_name_ = vcol->name;
        }

        const lwo2::FORM::SURF::BLOK *blok = dynamic_cast<const 
lwo2::FORM::SURF::BLOK *>(*j);
        if (blok) {
            Block new_block(blok);
            if (new_block.get_type() == "IMAP") {
                Clip_map::const_iterator i = 
clips.find(new_block.get_image_map().image_map);
                if (i != clips.end()) {
                    new_block.get_image_map().clip = &i->second;
                } else {
                    osg::notify(osg::WARN) << "Warning: lwosg::Surface: cannot 
find clip number " << new_block.get_image_map().image_map << std::endl;
                }                
            }
            blocks_.insert(Block_map::value_type(new_block.get_ordinal(), 
new_block));
        }
    }
}

void Surface::generate_stateset(unsigned int max_tex_units, bool 
force_arb_compression, const osgDB::ReaderWriter::Options* db_options) const
{
    if (!stateset_.valid()) {

        stateset_ = new osg::StateSet;

        osg::ref_ptr<osg::Material> material = new osg::Material;
        material->setDiffuse(osg::Material::FRONT_AND_BACK, 
osg::Vec4(base_color_ * diffuse_, 1-transparency_));
        material->setAmbient(osg::Material::FRONT_AND_BACK, 
material->getDiffuse(osg::Material::FRONT_AND_BACK));
        material->setSpecular(osg::Material::FRONT_AND_BACK, 
osg::Vec4(specularity_, specularity_, specularity_, 1));
        material->setShininess(osg::Material::FRONT_AND_BACK, powf(2, 10 * 
glossiness_ + 2));
        material->setEmission(osg::Material::FRONT_AND_BACK, 
osg::Vec4(base_color_ * luminosity_, 1-transparency_));
        stateset_->setAttributeAndModes(material.get());

        if (!color_map_name_.empty()) {
            material->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
        }

        if (transparency_ > 0) {
            osg::ref_ptr<osg::BlendFunc> bf = new osg::BlendFunc;
            bf->setFunction(osg::BlendFunc::SRC_ALPHA, 
osg::BlendFunc::ONE_MINUS_SRC_ALPHA);
            stateset_->setAttributeAndModes(bf.get());
            stateset_->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
        }

        if (sidedness_ == FRONT_AND_BACK) {
            stateset_->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
        } else {
            osg::ref_ptr<osg::CullFace> cf = new osg::CullFace;
            switch (sidedness_) {
                case NONE:  cf->setMode(osg::CullFace::FRONT_AND_BACK); break;
                case FRONT_ONLY: cf->setMode(osg::CullFace::BACK); break;
                case BACK_ONLY:  cf->setMode(osg::CullFace::FRONT); break;
                default: ;
            }
            stateset_->setAttributeAndModes(cf.get());
        }

        std::map< std::string, unsigned int > unitmap;
        unitmap[ "COLR" ] = 0;
        unitmap[ "TRAN" ] = 1;
        unsigned int unit = 0;
        for (Block_map::const_iterator i=blocks_.begin(); i!=blocks_.end(); 
++i) {

            const Block &block = i->second;
            if (!block.enabled()) {
                continue;
            }

            if (block.get_type() == "IMAP")
            {
                std::string channel = block.get_channel();
                if ( ( channel == "COLR" ) ||
                     ( channel == "TRAN" ) )
                {
                    unit = unitmap[ channel ];
                    if (block.get_image_map().clip)
                    {
                        std::string image_file = 
block.get_image_map().clip->get_still_filename();
                        if (!image_file.empty())
                        {

                            if (unit >= max_tex_units && max_tex_units > 0)
                            {
                                osg::notify(osg::WARN) << "Warning: 
lwosg::Surface: maximum number of texture units (" << max_tex_units << ") has 
been reached, skipping incoming blocks" << std::endl;
                                break;
                            }

                            osg::ref_ptr<osg::Texture2D> texture = new 
osg::Texture2D;
                            if (force_arb_compression)
                                
texture->setInternalFormatMode(osg::Texture::USE_ARB_COMPRESSION);
                            texture->setImage(osgDB::readImageFile(image_file, 
db_options));
                            texture->setWrap(osg::Texture::WRAP_S, 
osg_wrap_mode(block.get_image_map().width_wrap));
                            texture->setWrap(osg::Texture::WRAP_T, 
osg_wrap_mode(block.get_image_map().height_wrap));
                            texture->setFilter(osg::Texture::MIN_FILTER, 
osg::Texture::LINEAR_MIPMAP_LINEAR);
                            texture->setFilter(osg::Texture::MAG_FILTER, 
osg::Texture::LINEAR);
                            stateset_->setTextureAttributeAndModes(unit, 
texture.get());

                            osg::ref_ptr<osg::TexEnvCombine> tec = new 
osg::TexEnvCombine;
                            switch (block.get_opacity_type())
                            {
                                case Block::NORMAL:
                                {
                                    float s = block.get_opacity_amount();
                                    if (unit == 0)
                                    {
                                        
tec->setCombine_RGB(osg::TexEnvCombine::MODULATE);
                                        osg::Vec3 color(diffuse_, diffuse_, 
diffuse_);
                                        color = color * s + base_color_ * (1 - 
s);
                                        
material->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4(color, 
1-transparency_));
                                        
material->setAmbient(osg::Material::FRONT_AND_BACK, 
material->getDiffuse(osg::Material::FRONT_AND_BACK));
                                        
material->setColorMode(osg::Material::OFF);
                                    }
                                    else
                                    {
                                        
tec->setCombine_RGB(osg::TexEnvCombine::INTERPOLATE);
                                        tec->setConstantColor(osg::Vec4(s, s, 
s, s));
                                    }
                                }
                                break;

                                case Block::ADDITIVE:
                                    
tec->setCombine_RGB(osg::TexEnvCombine::ADD);
                                    break;

                                case Block::SUBTRACTIVE:
                                    osg::notify(osg::WARN) << "Warning: 
lwosg::Surface: 'Subtractive' blending mode is not supported, falling back to 
'Difference' mode" << std::endl;
                                case Block::DIFFERENCE:
                                    
tec->setCombine_RGB(osg::TexEnvCombine::SUBTRACT);
                                    break;

                                case Block::MULTIPLY:
                                    
tec->setCombine_RGB(osg::TexEnvCombine::MODULATE);
                                    break;

                                case Block::DIVIDE:
                                    osg::notify(osg::WARN) << "Warning: 
lwosg::Surface: 'Divide' blending mode is not supported" << std::endl;
                                    break;

                                case Block::ALPHA:
                                    osg::notify(osg::WARN) << "Warning: 
lwosg::Surface: 'Alpha' blending mode is not supported" << std::endl;
                                    break;

                                case Block::TEXTURE_DISPLACEMENT:
                                    osg::notify(osg::WARN) << "Warning: 
lwosg::Surface: 'Texture Displacement' blending mode is not supported" << 
std::endl;
                                    break;

                                default:
                                break;
                            };

                            stateset_->setTextureAttributeAndModes(unit, 
tec.get());
                            ++unit;
                        }
                    }
                }
                else
                {
                    osg::notify(osg::WARN) << "Warning: lwosg::Surface: texture 
channels of type '" << block.get_channel() << "' are not supported, this block 
will be ignored" << std::endl;
                }
            }
        }
    }
}

osg::Group *Surface::apply(osg::Geometry *geo, const VertexMap_map 
*texture_maps, const VertexMap_map *rgb_maps, const VertexMap_map *rgba_maps, 
int max_tex_units, bool use_osgfx, bool force_arb_compression, const 
VertexMap_binding_map &texmap_bindings, const osgDB::ReaderWriter::Options* 
db_options) const
{
    int num_points = 0;

    if (geo->getVertexArray()) {
        num_points = static_cast<int>(geo->getVertexArray()->getNumElements());
    }

    generate_stateset(max_tex_units, force_arb_compression, db_options);
    geo->setStateSet(stateset_.get());

    int unit = 0;
    for (Block_map::const_iterator i=blocks_.begin(); i!=blocks_.end(); ++i) {
        const Block &block = i->second;
        if (block.get_type() == "IMAP" && block.get_channel() == "COLR" && 
block.get_image_map().clip) {
            std::string image_file = 
block.get_image_map().clip->get_still_filename();
            if (!image_file.empty()) {
                if (block.get_image_map().projection == Image_map::UV) {
                    VertexMap_map::const_iterator i = 
texture_maps->find(block.get_image_map().uv_map);
                    if (i != texture_maps->end()) {
                        geo->setTexCoordArray(unit, 
i->second->asVec2Array(num_points));
                    } else {
                        osg::notify(osg::WARN) << "Warning: lwosg::Surface: 
surface '" << name_ << "' needs texture map named '" << 
block.get_image_map().uv_map << "' but I can't find it" << std::endl;
                    }
                }
                ++unit;
            }
        }
    }

    for (VertexMap_binding_map::const_iterator vi=texmap_bindings.begin(); 
vi!=texmap_bindings.end(); ++vi)
    {
        for (VertexMap_map::const_iterator j=texture_maps->begin(); 
j!=texture_maps->end(); ++j)
        {
            if (j->first == vi->first)
            {
                if (geo->getTexCoordArray(vi->second) != 0)
                {
                    osg::notify(osg::WARN) << "Warning: lwosg::Surface: 
explicing binding of texture map '" << vi->first << "' to texunit " << 
vi->second << " will replace existing texture map" << std::endl;
                }
                geo->setTexCoordArray(vi->second, 
j->second->asVec2Array(num_points));
            }
            else
            {
                osg::notify(osg::WARN) << "Warning: lwosg::Surface: explicit 
binding of texture map '" << vi->first << "' to texunit " << vi->second << " 
was requested but there is no such map in this LWO file" << std::endl;
            }
        }
    }
    
    osg::Vec4 color = osg::Vec4(base_color_, 1-transparency_);

    const VertexMap_map *color_maps = 0;

    if (color_map_type_ == "RGB ") {
        color_maps = rgb_maps;
    }

    if (color_map_type_ == "RGBA") {
        color_maps = rgba_maps;
    }

    if (color_maps) {
        VertexMap_map::const_iterator i = color_maps->find(color_map_name_);
        if (i != color_maps->end() && !i->second->empty()) {
            geo->setColorArray(i->second->asVec4Array(num_points, color * 
color_map_intensity_, color * color_map_intensity_));
            geo->setColorBinding(osg::Geometry::BIND_PER_VERTEX);
        } else {
            osg::notify(osg::WARN) << "Warning: lwosg::Surface: surface '" << 
name_ << "' needs color map named '" << color_map_name_ << "' but I can't find 
it" << std::endl;
        }
    }

    // create osgFX specularity if needed
    if (use_osgfx && glossiness_ > 0 && specularity_ > 0) {
        if (unit >= max_tex_units && max_tex_units > 0) {
            osg::notify(osg::WARN) << "Warning: lwosg::Surface: can't apply 
osgFX specular lighting: maximum number of texture units (" << max_tex_units << 
") has been reached" << std::endl;
        } else {
            osg::ref_ptr<osgFX::SpecularHighlights> sh = new 
osgFX::SpecularHighlights;
            sh->setTextureUnit(unit);
            osg::Material *material = dynamic_cast<osg::Material 
*>(stateset_->getAttribute(osg::StateAttribute::MATERIAL));
            if (material) {
                
sh->setSpecularColor(material->getSpecular(osg::Material::FRONT_AND_BACK));
                sh->setSpecularExponent(powf(2, 10 * glossiness_ + 2));
                material->setSpecular(osg::Material::FRONT_AND_BACK, 
osg::Vec4(0, 0, 0, 0));
                material->setShininess(osg::Material::FRONT_AND_BACK, 0);
            }
            return sh.release();
        }
    }

    return 0;
}
/*******************************************************
      Lightwave Object Loader for OSG

  Copyright (C) 2004 Marco Jez <[EMAIL PROTECTED]>
  OpenSceneGraph is (C) 2004 Robert Osfield
********************************************************/

#ifndef LWOSG_SURFACE_
#define LWOSG_SURFACE_

#include "lwo2chunks.h"

#include "VertexMap.h"
#include "Block.h"
#include "Clip.h"

#include <osg/ref_ptr>
#include <osg/Vec3>
#include <osg/StateSet>
#include <osg/Geometry>

#include <osgDB/ReaderWriter>

#include <string>
#include <map>

namespace lwosg
{

    class Surface {
    public:

        enum Sidedness {
            NONE           = 0,
            FRONT_ONLY     = 1,
            BACK_ONLY      = 2,
            FRONT_AND_BACK = 3
        };

        typedef std::multimap<std::string, Block> Block_map;

        Surface();
        Surface(const lwo2::FORM::SURF *surf, const Clip_map &clips);

        void compile(const lwo2::FORM::SURF *surf, const Clip_map &clips);

        osg::Group *apply(osg::Geometry *geo, const VertexMap_map 
*texture_maps, const VertexMap_map *rgb_maps, const VertexMap_map *rgba_maps, 
int max_tex_units, bool use_osgfx, bool force_arb_compression, const 
VertexMap_binding_map &texmap_bindings, const osgDB::ReaderWriter::Options 
*db_options) const;

        void generate_stateset(unsigned int max_tex_units, bool 
force_arb_compression, const osgDB::ReaderWriter::Options* options) const;

        inline const std::string &get_name() const { return name_; }
        inline void set_name(const std::string &n) { name_ = n; }

        inline const osg::Vec3 &get_base_color() const { return base_color_; }

        inline float get_diffuse() const { return diffuse_; }
        inline float get_luminosity() const { return luminosity_; }
        inline float get_specularity() const { return specularity_; }
        inline float get_reflection() const { return reflection_; }
        inline float get_transparency() const { return transparency_; }
        inline float get_translucency() const { return translucency_; }
        inline float get_glossiness() const { return glossiness_; }

        inline Sidedness get_sidedness() const { return sidedness_; }

        inline float get_max_smoothing_angle() const { return 
max_smoothing_angle_; }

        inline const std::string &get_color_map_type() const { return 
color_map_type_; }
        inline const std::string &get_color_map_name() const { return 
color_map_name_; }
        inline float get_color_map_intensity() const { return 
color_map_intensity_; }

        inline Block_map &blocks() { return blocks_; }
        inline const Block_map &blocks() const { return blocks_; }
/*
        inline const std::string &get_uv_map_name() const { return 
uv_map_name_; }

        inline bool has_clip() const { return clip_ != 0; }
        inline const Clip *get_clip() const { return clip_; }
        inline void set_clip(const Clip *c) { clip_ = c; }
*/
    private:
        std::string name_;
        osg::Vec3 base_color_;
        float diffuse_;
        float luminosity_;
        float specularity_;
        float reflection_;
        float transparency_;
        float translucency_;
        float glossiness_;
        Sidedness sidedness_;
        float max_smoothing_angle_;
        std::string color_map_type_;
        std::string color_map_name_;
        float color_map_intensity_;

        Block_map blocks_;
/*
        std::string uv_map_name_;
        const Clip *clip_;
*/
        mutable osg::ref_ptr<osg::StateSet> stateset_;
    };

}

#endif
_______________________________________________
osg-submissions mailing list
[email protected]
http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org

Reply via email to