Show
Ignore:
Timestamp:
05/28/09 15:29:20 (4 years ago)
Author:
robert
Message:

From Gregory Jaegy and Robert Osfield, added support for static linking of OpenFlight? plugin

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/AncillaryRecords.cpp

    r9067 r10283  
    8585}; 
    8686 
    87 RegisterRecordProxy<Comment>    g_Comment(COMMENT_OP); 
     87REGISTER_FLTRECORD(Comment, COMMENT_OP) 
     88 
    8889 
    8990 
     
    112113}; 
    113114 
    114 RegisterRecordProxy<LongID> g_LongID(LONG_ID_OP); 
     115REGISTER_FLTRECORD(LongID, LONG_ID_OP) 
     116 
    115117 
    116118 
     
    151153}; 
    152154 
    153 RegisterRecordProxy<Matrix> g_Matrix(MATRIX_OP); 
     155REGISTER_FLTRECORD(Matrix, MATRIX_OP) 
     156 
    154157 
    155158 
     
    229232}; 
    230233 
    231 RegisterRecordProxy<Multitexture> g_Multitexture(MULTITEXTURE_OP); 
     234REGISTER_FLTRECORD(Multitexture, MULTITEXTURE_OP) 
     235 
    232236 
    233237 
     
    285289}; 
    286290 
    287 RegisterRecordProxy<UVList> g_UVList(UV_LIST_OP); 
     291REGISTER_FLTRECORD(UVList, UV_LIST_OP) 
    288292 
    289293 
     
    311315}; 
    312316 
    313 RegisterRecordProxy<Replicate> g_Replicate(REPLICATE_OP); 
    314  
     317REGISTER_FLTRECORD(Replicate, REPLICATE_OP) 
    315318 
    316319// Prevent "unknown record" message for the following ancillary records: 
    317 RegisterRecordProxy<DummyRecord> g_OldTranslate(OLD_TRANSLATE2_OP); 
    318 RegisterRecordProxy<DummyRecord> g_OldRotateAboutPoint(OLD_ROTATE_ABOUT_POINT_OP); 
    319 RegisterRecordProxy<DummyRecord> g_OldRotateAboutEdge(OLD_ROTATE_ABOUT_EDGE_OP); 
    320 RegisterRecordProxy<DummyRecord> g_OldScale(OLD_SCALE_OP); 
    321 RegisterRecordProxy<DummyRecord> g_OldTranslate2(OLD_TRANSLATE_OP); 
    322 RegisterRecordProxy<DummyRecord> g_OldNonuniformScale(OLD_NONUNIFORM_SCALE_OP); 
    323 RegisterRecordProxy<DummyRecord> g_OldRotateAboutPoint2(OLD_ROTATE_ABOUT_POINT2_OP); 
    324 RegisterRecordProxy<DummyRecord> g_OldRotateScaleToPoint(OLD_ROTATE_SCALE_TO_POINT_OP); 
    325 RegisterRecordProxy<DummyRecord> g_OldPutTransform(OLD_PUT_TRANSFORM_OP); 
    326 RegisterRecordProxy<DummyRecord> g_OldBoundingBox(OLD_BOUNDING_BOX_OP); 
    327 RegisterRecordProxy<DummyRecord> g_IndexedString(INDEXED_STRING_OP); 
    328 RegisterRecordProxy<DummyRecord> g_RoadZone(ROAD_ZONE_OP); 
    329 RegisterRecordProxy<DummyRecord> g_RotateAboutEdge(ROTATE_ABOUT_EDGE_OP); 
    330 RegisterRecordProxy<DummyRecord> g_Translate(TRANSLATE_OP); 
    331 RegisterRecordProxy<DummyRecord> g_Scale(NONUNIFORM_SCALE_OP); 
    332 RegisterRecordProxy<DummyRecord> g_RotateAboutPoint(ROTATE_ABOUT_POINT_OP); 
    333 RegisterRecordProxy<DummyRecord> g_RotateScaleToPoint(ROTATE_SCALE_TO_POINT_OP); 
    334 RegisterRecordProxy<DummyRecord> g_PutTransform(PUT_TRANSFORM_OP); 
    335 RegisterRecordProxy<DummyRecord> g_GeneralMatrix(GENERAL_MATRIX_OP); 
    336 RegisterRecordProxy<DummyRecord> g_Vector(VECTOR_OP); 
    337 RegisterRecordProxy<DummyRecord> g_BoundingBox(BOUNDING_BOX_OP); 
    338 RegisterRecordProxy<DummyRecord> g_BoundingSphere(BOUNDING_SPHERE_OP); 
    339 RegisterRecordProxy<DummyRecord> g_BoundingCylinder(BOUNDING_CYLINDER_OP); 
    340 RegisterRecordProxy<DummyRecord> g_BoundingConvexHull(BOUNDING_CONVEX_HULL_OP); 
    341 RegisterRecordProxy<DummyRecord> g_BoundingHistogram(BOUNDING_HISTOGRAM); 
    342 RegisterRecordProxy<DummyRecord> g_BoundingVolumeCenter(BOUNDING_VOLUME_CENTER_OP); 
    343 RegisterRecordProxy<DummyRecord> g_BoundingVolumeOrientation(BOUNDING_VOLUME_ORIENTATION_OP); 
    344 RegisterRecordProxy<DummyRecord> g_HistogramBoundingVolume(HISTOGRAM_BOUNDING_VOLUME_OP); 
     320REGISTER_FLTRECORD(DummyRecord, OLD_TRANSLATE2_OP) 
     321REGISTER_FLTRECORD(DummyRecord, OLD_ROTATE_ABOUT_POINT_OP) 
     322REGISTER_FLTRECORD(DummyRecord, OLD_ROTATE_ABOUT_EDGE_OP) 
     323REGISTER_FLTRECORD(DummyRecord, OLD_SCALE_OP) 
     324REGISTER_FLTRECORD(DummyRecord, OLD_TRANSLATE_OP) 
     325REGISTER_FLTRECORD(DummyRecord, OLD_NONUNIFORM_SCALE_OP) 
     326REGISTER_FLTRECORD(DummyRecord, OLD_ROTATE_ABOUT_POINT2_OP) 
     327REGISTER_FLTRECORD(DummyRecord, OLD_ROTATE_SCALE_TO_POINT_OP) 
     328REGISTER_FLTRECORD(DummyRecord, OLD_PUT_TRANSFORM_OP) 
     329REGISTER_FLTRECORD(DummyRecord, OLD_BOUNDING_BOX_OP) 
     330REGISTER_FLTRECORD(DummyRecord, INDEXED_STRING_OP) 
     331REGISTER_FLTRECORD(DummyRecord, ROAD_ZONE_OP) 
     332REGISTER_FLTRECORD(DummyRecord, ROTATE_ABOUT_EDGE_OP) 
     333REGISTER_FLTRECORD(DummyRecord, TRANSLATE_OP) 
     334REGISTER_FLTRECORD(DummyRecord, NONUNIFORM_SCALE_OP) 
     335REGISTER_FLTRECORD(DummyRecord, ROTATE_ABOUT_POINT_OP) 
     336REGISTER_FLTRECORD(DummyRecord, ROTATE_SCALE_TO_POINT_OP) 
     337REGISTER_FLTRECORD(DummyRecord, PUT_TRANSFORM_OP) 
     338REGISTER_FLTRECORD(DummyRecord, GENERAL_MATRIX_OP) 
     339REGISTER_FLTRECORD(DummyRecord, VECTOR_OP) 
     340REGISTER_FLTRECORD(DummyRecord, BOUNDING_BOX_OP) 
     341REGISTER_FLTRECORD(DummyRecord, BOUNDING_SPHERE_OP) 
     342REGISTER_FLTRECORD(DummyRecord, BOUNDING_CYLINDER_OP) 
     343REGISTER_FLTRECORD(DummyRecord, BOUNDING_CONVEX_HULL_OP) 
     344REGISTER_FLTRECORD(DummyRecord, BOUNDING_HISTOGRAM) 
     345REGISTER_FLTRECORD(DummyRecord, BOUNDING_VOLUME_CENTER_OP) 
     346REGISTER_FLTRECORD(DummyRecord, BOUNDING_VOLUME_ORIENTATION_OP) 
     347REGISTER_FLTRECORD(DummyRecord, HISTOGRAM_BOUNDING_VOLUME_OP) 
     348 
    345349 
    346350} // end namespace