Show
Ignore:
Timestamp:
10/21/14 17:10:27 (5 days ago)
Author:
robert
Message:

Added shaders to support experimental shader based displacement mapping technique osgTerrain::ShaderTerrain?.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/branches/OpenSceneGraph-3.2/src/osgPlugins/lwo/lwo2parser.h

    r13041 r14038  
    3636        iff::Chunk *parse_subchunk(Iter &it, const std::string &context); 
    3737 
    38                 Parser& operator = (const Parser&) { return *this; } 
     38        Parser& operator = (const Parser&) { return *this; } 
    3939    }; 
    4040 
     
    895895        std::string tag; 
    896896        for (int i=0; i<4; ++i) tag += *(it++); 
    897         unsigned int len = ((static_cast<unsigned int>(*(it++)) & 0xFF) << 8) | 
    898             (static_cast<unsigned int>(*(it++)) & 0xFF); 
     897 
     898        unsigned int len = ((static_cast<unsigned int>(*it) & 0xFF) << 8) | (static_cast<unsigned int>(*(it+1)) & 0xFF); 
     899        it += 2; 
     900 
    899901        this->os() << "DEBUG INFO: lwo2parser: reading subchunk " << tag << ", length = " << len << ", context = " << context << "\n"; 
    900902        iff::Chunk *chk = parse_chunk_data(tag, context, it, it+len);