Changeset 8563

Show
Ignore:
Timestamp:
07/11/08 19:41:50
Author:
robert
Message:

From Joakim Simmonsson, fixed various spelling typos in comments

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/AncillaryRecords.cpp

    r7748 r8563  
    243243                        float32    v = in.readFloat32(); 
    244244 
    245                         // Add texture coodinates to geometry. 
     245                        // Add texture coordinates to geometry. 
    246246                        if (_parent.valid()) 
    247247                            _parent->addVertexUV(layer,osg::Vec2(u,v)); 

  • OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/Document.cpp

    r7931 r8563  
    9595    if (!_currentPrimaryRecord.valid()) 
    9696    { 
    97         osg::notify(osg::WARN) << "Can't descide primary in Document::popExtension()." << std::endl; 
     97        osg::notify(osg::WARN) << "Can't decide primary in Document::popExtension()." << std::endl; 
    9898        return; 
    9999    } 

  • OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/Document.h

    r8003 r8563  
    9696        const osgDB::ReaderWriter::Options* getOptions() const { return _options.get(); } 
    9797 
    98         // Current primar record 
     98        // Current primary record 
    9999        void setCurrentPrimaryRecord(PrimaryRecord* record) { _currentPrimaryRecord=record; } 
    100100        PrimaryRecord* getCurrentPrimaryRecord() { return _currentPrimaryRecord.get(); } 

  • OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/ExportOptions.cpp

    r8010 r8563  
    7575/** Value: "stripTextureFilePath". 
    7676 *  If present in the Options string, the exporter strips the path from 
    77  *  texture file names, and writes only the texure file name to the FLT 
     77 *  texture file names, and writes only the texture file name to the FLT 
    7878 *  Texture Palette. By default, the exporter doesn't strip the path, 
    7979 *  and the name written to the Texture Palette is taken directly from 

  • OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/FltExportVisitor.cpp

    r8301 r8563  
    103103 
    104104 
    105     // Temp file for storing records. Need a temp file because we candon't 
     105    // Temp file for storing records. Need a temp file because we don't 
    106106    // write header and palette until FltExportVisitor completes traversal. 
    107107    _recordsTempName = fltOpt->getTempDir() + "/ofw_temp_records"; 
    …… 
    148148    //   Header record -- Don't need to support this here. We always output a header. 
    149149    //   Group record -- HIGH 
    150     //   Child of an LOD node -- HIGH Curently write out a Group record regardless. 
     150    //   Child of an LOD node -- HIGH Currently write out a Group record regardless. 
    151151    //   InstanceDefinition/InstanceReference -- MED --  multiparented Group is an instance 
    152152    //   Extension record -- MED 
    …… 
    213213    ScopedStatePushPop guard( this, lodNode.getStateSet() ); 
    214214 
    215     // LOD center - same for all chilrden 
     215    // LOD center - same for all children 
    216216    osg::Vec3d center = lodNode.getCenter(); 
    217217 
    …… 
    240240{ 
    241241    // Importer reads a Matrix record and inserts a MatrixTransform above 
    242     //   the corrent node. We need to do the opposite: Write a Matrix record 
     242    //   the current node. We need to do the opposite: Write a Matrix record 
    243243    //   as an ancillary record for each child. We do that by storing the 
    244244    //   MatrixTransform in each child's UserData. Each child then checks 
    …… 
    454454    { 
    455455        // Unknown Node. Warn and return. 
    456         // (Note, if the base class of this Node was a Grouo, then apply(Group&) 
     456        // (Note, if the base class of this Node was a Group, then apply(Group&) 
    457457        //   would export a Group record then continue traversal. Because we are 
    458458        //   a Node, there's no way to continue traversal, so just return.) 
    …… 
    487487    _recordsStr.close(); 
    488488 
    489     // Write OpenFlight file front matter: heqader, vertex palette, etc. 
     489    // Write OpenFlight file front matter: header, vertex palette, etc. 
    490490    writeHeader( node.getName() ); 
    491491 

  • OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/PaletteRecords.cpp

    r8462 r8563  
    4949        uint32 paletteSize = in.readUInt32(); 
    5050 
    51         // Enteries in vertex pool found by offset from start of this record. 
     51        // Entries in vertex pool found by offset from start of this record. 
    5252        const int RECORD_HEADER_SIZE = 4; 
    5353        const int OFFSET = RECORD_HEADER_SIZE+sizeof(paletteSize); 

  • OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/Pools.h

    r8003 r8563  
    309309 
    310310// This object records parent palettes for external record support. 
    311 // When an external record is parsed, this object is instatiated and populated with 
     311// When an external record is parsed, this object is instantiated and populated with 
    312312// the parent model's palettes, then stored as UserData on the ProxyNode. 
    313313// When the ReadExternalsVisitor hits the ProxyNode, it moves this object 

  • OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/PrimaryRecords.cpp

    r8385 r8563  
    314314    { 
    315315        float64 min;            // Minimum value with respect to the local coord system 
    316         float64 max;            // Maximum value with respect to the local coordsystem 
     316        float64 max;            // Maximum value with respect to the local coord system 
    317317        float64 current;        // Current value with respect to the local coord system 
    318318        float64 increment;      // Increment 

  • OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/RecordInputStream.cpp

    r8003 r8563  
    6060    if (prototype) 
    6161    { 
    62 #if 0 // for debuging 
     62#if 0 // for debugging 
    6363        { 
    6464            for (int i=0; i<document.level(); i++) 

  • OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/VertexPaletteManager.cpp

    r8086 r8563  
    178178    if (t) 
    179179    { 
    180         // Texture coordinstes 
     180        // Texture coordinates 
    181181        if (n) 
    182182            return VERTEX_CNT; 
    …… 
    186186    else 
    187187    { 
    188         // No textue coordinates 
     188        // No texture coordinates 
    189189        if (n) 
    190190            return VERTEX_CN; 
    …… 
    355355    default: 
    356356    { 
    357         osg::notify( osg::WARN ) << "fltexp: Unsupported array type in conv ersion to Vec2Array: " << arrayType << std::endl; 
     357        osg::notify( osg::WARN ) << "fltexp: Unsupported array type in conversion to Vec2Array: " << arrayType << std::endl; 
    358358        return NULL; 
    359359    } 

  • OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/VertexRecords.cpp

    r7748 r8563  
    215215 
    216216 
    217 /** Absolut Vertex - 
     217/** Absolute Vertex - 
    218218  * version < 13 
    219219  */ 

  • OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/expAncillaryRecords.cpp

    r8003 r8563  
    2626 
    2727 
    28 /** If the DataOutputStream paraqmeter is NULL, write to the _records 
     28/** If the DataOutputStream parameter is NULL, write to the _records 
    2929    member variable. Otherwise, write to the specified DataOutputStream. 
    3030    */ 
    …… 
    6060} 
    6161 
    62 /** If the DataOutputStream paraqmeter is NULL, write to the _records 
     62/** If the DataOutputStream parameter is NULL, write to the _records 
    6363    member variable. Otherwise, write to the specified DataOutputStream. 
    6464    */ 

  • OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/expGeometryRecords.cpp

    r8301 r8563  
    495495    unsigned int idx; 
    496496    for( idx=0; idx<count; idx++) 
    497         // I'm imaginining that 'first' will be a 0-based index into the  
     497        // I'm imagining that 'first' will be a 0-based index into the  
    498498        //   'current' set of vertices held by the vertex palette manager. 
    499499        _records->writeInt32( _vertexPalette->byteOffset( first+idx ) ); 
    …… 
    510510    unsigned int idx; 
    511511    for( idx=0; idx<count; idx++) 
    512         // I'm imaginining that 'first' will be a 0-based index into the  
     512        // I'm imagining that 'first' will be a 0-based index into the  
    513513        //   'current' set of vertices held by the vertex palette manager. 
    514514        _records->writeInt32( _vertexPalette->byteOffset( indices[ idx ] ) ); 

  • OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/expPrimaryRecords.cpp

    r8086 r8563  
    662662 
    663663    // In OSG, each LightPoint within a LightPointNode  can have different appearance 
    664     // parameters, but in OpenFlight, a Light Point Record contains a list of homogenous 
     664    // parameters, but in OpenFlight, a Light Point Record contains a list of homogeneous 
    665665    // vertices. To be correct, we'd have to look at all LightPoints in the LightPointNode 
    666666    // and spew out multiple FLT records for each group that shared common appearance 
    …… 
    681681    } 
    682682 
    683     // Note that true bidirectional light points are currently unsupported (they are inavailable 
     683    // Note that true bidirectional light points are currently unsupported (they are unavailable 
    684684    // in OSG, so we never write them out to FLT as BIDIRECTIONAL. 
    685685    int32 directionality( OMNIDIRECTIONAL ); 
    …… 
    735735        _records->writeFloat32( 0.f ); // Directional ambient intensity 
    736736        _records->writeFloat32( animPeriod ); // Animation period in seconds 
    737         _records->writeFloat32( animPhaseDelay ); // Animation phase delay in secnds 
     737        _records->writeFloat32( animPhaseDelay ); // Animation phase delay in seconds 
    738738        _records->writeFloat32( animEnabled ); // Animation enabled period in seconds 
    739739        _records->writeFloat32( 1.f ); // Significance