diff --git a/plugins/3d/vrml/v1/vrml1_node.cpp b/plugins/3d/vrml/v1/vrml1_node.cpp index fbf734c05a..2effa2fc16 100644 --- a/plugins/3d/vrml/v1/vrml1_node.cpp +++ b/plugins/3d/vrml/v1/vrml1_node.cpp @@ -97,41 +97,41 @@ WRL1NODE::WRL1NODE( NAMEREGISTER* aDictionary ) if( nodenames.empty() ) { - nodenames.insert( NODEITEM( "AsciiText", WRL1NODES::WRL1_ASCIITEXT ) ); - nodenames.insert( NODEITEM( "Cone", WRL1NODES::WRL1_CONE ) ); - nodenames.insert( NODEITEM( "Coordinate3", WRL1NODES::WRL1_COORDINATE3 ) ); - nodenames.insert( NODEITEM( "Cube", WRL1NODES::WRL1_CUBE ) ); - nodenames.insert( NODEITEM( "Cylinder", WRL1NODES::WRL1_CYLINDER ) ); - nodenames.insert( NODEITEM( "DirectionalLight", WRL1NODES::WRL1_DIRECTIONALLIGHT ) ); - nodenames.insert( NODEITEM( "FontStyle", WRL1NODES::WRL1_FONTSTYLE ) ); - nodenames.insert( NODEITEM( "Group", WRL1NODES::WRL1_GROUP ) ); - nodenames.insert( NODEITEM( "IndexedFaceSet", WRL1NODES::WRL1_INDEXEDFACESET ) ); - nodenames.insert( NODEITEM( "IndexedLineSet", WRL1NODES::WRL1_INDEXEDLINESET ) ); - nodenames.insert( NODEITEM( "Info", WRL1NODES::WRL1_INFO ) ); - nodenames.insert( NODEITEM( "LOD", WRL1NODES::WRL1_LOD ) ); - nodenames.insert( NODEITEM( "Material", WRL1NODES::WRL1_MATERIAL ) ); - nodenames.insert( NODEITEM( "MaterialBinding", WRL1NODES::WRL1_MATERIALBINDING ) ); - nodenames.insert( NODEITEM( "MatrixTransform", WRL1NODES::WRL1_MATRIXTRANSFORM ) ); - nodenames.insert( NODEITEM( "Normal", WRL1NODES::WRL1_NORMAL ) ); - nodenames.insert( NODEITEM( "NormalBinding", WRL1NODES::WRL1_NORMALBINDING ) ); - nodenames.insert( NODEITEM( "OrthographicCamera", WRL1NODES::WRL1_ORTHOCAMERA ) ); - nodenames.insert( NODEITEM( "PerspectiveCamera", WRL1NODES::WRL1_PERSPECTIVECAMERA ) ); - nodenames.insert( NODEITEM( "PointLight", WRL1NODES::WRL1_POINTLIGHT ) ); - nodenames.insert( NODEITEM( "PointSet", WRL1NODES::WRL1_POINTSET ) ); - nodenames.insert( NODEITEM( "Rotation", WRL1NODES::WRL1_ROTATION ) ); - nodenames.insert( NODEITEM( "Scale", WRL1NODES::WRL1_SCALE ) ); - nodenames.insert( NODEITEM( "Separator", WRL1NODES::WRL1_SEPARATOR ) ); - nodenames.insert( NODEITEM( "ShapeHints", WRL1NODES::WRL1_SHAPEHINTS ) ); - nodenames.insert( NODEITEM( "Sphere", WRL1NODES::WRL1_SPHERE ) ); - nodenames.insert( NODEITEM( "SpotLight", WRL1NODES::WRL1_SPOTLIGHT ) ); - nodenames.insert( NODEITEM( "Switch", WRL1NODES::WRL1_SWITCH ) ); - nodenames.insert( NODEITEM( "Texture2", WRL1NODES::WRL1_TEXTURE2 ) ); - nodenames.insert( NODEITEM( "Testure2Transform", WRL1NODES::WRL1_TEXTURE2TRANSFORM ) ); - nodenames.insert( NODEITEM( "TextureCoordinate2", WRL1NODES::WRL1_TEXTURECOORDINATE2 ) ); - nodenames.insert( NODEITEM( "Transform", WRL1NODES::WRL1_TRANSFORM ) ); - nodenames.insert( NODEITEM( "Translation", WRL1NODES::WRL1_TRANSLATION ) ); - nodenames.insert( NODEITEM( "WWWAnchor", WRL1NODES::WRL1_WWWANCHOR ) ); - nodenames.insert( NODEITEM( "WWWInline", WRL1NODES::WRL1_WWWINLINE ) ); + nodenames.emplace( NODEITEM( "AsciiText", WRL1NODES::WRL1_ASCIITEXT ) ); + nodenames.emplace( NODEITEM( "Cone", WRL1NODES::WRL1_CONE ) ); + nodenames.emplace( NODEITEM( "Coordinate3", WRL1NODES::WRL1_COORDINATE3 ) ); + nodenames.emplace( NODEITEM( "Cube", WRL1NODES::WRL1_CUBE ) ); + nodenames.emplace( NODEITEM( "Cylinder", WRL1NODES::WRL1_CYLINDER ) ); + nodenames.emplace( NODEITEM( "DirectionalLight", WRL1NODES::WRL1_DIRECTIONALLIGHT ) ); + nodenames.emplace( NODEITEM( "FontStyle", WRL1NODES::WRL1_FONTSTYLE ) ); + nodenames.emplace( NODEITEM( "Group", WRL1NODES::WRL1_GROUP ) ); + nodenames.emplace( NODEITEM( "IndexedFaceSet", WRL1NODES::WRL1_INDEXEDFACESET ) ); + nodenames.emplace( NODEITEM( "IndexedLineSet", WRL1NODES::WRL1_INDEXEDLINESET ) ); + nodenames.emplace( NODEITEM( "Info", WRL1NODES::WRL1_INFO ) ); + nodenames.emplace( NODEITEM( "LOD", WRL1NODES::WRL1_LOD ) ); + nodenames.emplace( NODEITEM( "Material", WRL1NODES::WRL1_MATERIAL ) ); + nodenames.emplace( NODEITEM( "MaterialBinding", WRL1NODES::WRL1_MATERIALBINDING ) ); + nodenames.emplace( NODEITEM( "MatrixTransform", WRL1NODES::WRL1_MATRIXTRANSFORM ) ); + nodenames.emplace( NODEITEM( "Normal", WRL1NODES::WRL1_NORMAL ) ); + nodenames.emplace( NODEITEM( "NormalBinding", WRL1NODES::WRL1_NORMALBINDING ) ); + nodenames.emplace( NODEITEM( "OrthographicCamera", WRL1NODES::WRL1_ORTHOCAMERA ) ); + nodenames.emplace( NODEITEM( "PerspectiveCamera", WRL1NODES::WRL1_PERSPECTIVECAMERA ) ); + nodenames.emplace( NODEITEM( "PointLight", WRL1NODES::WRL1_POINTLIGHT ) ); + nodenames.emplace( NODEITEM( "PointSet", WRL1NODES::WRL1_POINTSET ) ); + nodenames.emplace( NODEITEM( "Rotation", WRL1NODES::WRL1_ROTATION ) ); + nodenames.emplace( NODEITEM( "Scale", WRL1NODES::WRL1_SCALE ) ); + nodenames.emplace( NODEITEM( "Separator", WRL1NODES::WRL1_SEPARATOR ) ); + nodenames.emplace( NODEITEM( "ShapeHints", WRL1NODES::WRL1_SHAPEHINTS ) ); + nodenames.emplace( NODEITEM( "Sphere", WRL1NODES::WRL1_SPHERE ) ); + nodenames.emplace( NODEITEM( "SpotLight", WRL1NODES::WRL1_SPOTLIGHT ) ); + nodenames.emplace( NODEITEM( "Switch", WRL1NODES::WRL1_SWITCH ) ); + nodenames.emplace( NODEITEM( "Texture2", WRL1NODES::WRL1_TEXTURE2 ) ); + nodenames.emplace( NODEITEM( "Testure2Transform", WRL1NODES::WRL1_TEXTURE2TRANSFORM ) ); + nodenames.emplace( NODEITEM( "TextureCoordinate2", WRL1NODES::WRL1_TEXTURECOORDINATE2 ) ); + nodenames.emplace( NODEITEM( "Transform", WRL1NODES::WRL1_TRANSFORM ) ); + nodenames.emplace( NODEITEM( "Translation", WRL1NODES::WRL1_TRANSLATION ) ); + nodenames.emplace( NODEITEM( "WWWAnchor", WRL1NODES::WRL1_WWWANCHOR ) ); + nodenames.emplace( NODEITEM( "WWWInline", WRL1NODES::WRL1_WWWINLINE ) ); } } diff --git a/plugins/3d/vrml/v2/vrml2_node.cpp b/plugins/3d/vrml/v2/vrml2_node.cpp index d2b2fce01d..4756e5e05b 100644 --- a/plugins/3d/vrml/v2/vrml2_node.cpp +++ b/plugins/3d/vrml/v2/vrml2_node.cpp @@ -51,81 +51,81 @@ WRL2NODE::WRL2NODE() if( badNames.empty() ) { - badNames.insert( "DEF" ); - badNames.insert( "EXTERNPROTO" ); - badNames.insert( "FALSE" ); - badNames.insert( "IS" ); - badNames.insert( "NULL" ); - badNames.insert( "PROTO" ); - badNames.insert( "ROUTE" ); - badNames.insert( "TO" ); - badNames.insert( "TRUE" ); - badNames.insert( "USE" ); - badNames.insert( "eventIn" ); - badNames.insert( "eventOut" ); - badNames.insert( "exposedField" ); - badNames.insert( "field" ); + badNames.emplace( "DEF" ); + badNames.emplace( "EXTERNPROTO" ); + badNames.emplace( "FALSE" ); + badNames.emplace( "IS" ); + badNames.emplace( "NULL" ); + badNames.emplace( "PROTO" ); + badNames.emplace( "ROUTE" ); + badNames.emplace( "TO" ); + badNames.emplace( "TRUE" ); + badNames.emplace( "USE" ); + badNames.emplace( "eventIn" ); + badNames.emplace( "eventOut" ); + badNames.emplace( "exposedField" ); + badNames.emplace( "field" ); } if( nodenames.empty() ) { - nodenames.insert( NODEITEM( "Anchor", WRL2NODES::WRL2_ANCHOR ) ); - nodenames.insert( NODEITEM( "Appearance", WRL2NODES::WRL2_APPEARANCE ) ); - nodenames.insert( NODEITEM( "Audioclip", WRL2NODES::WRL2_AUDIOCLIP ) ); - nodenames.insert( NODEITEM( "Background", WRL2NODES::WRL2_BACKGROUND ) ); - nodenames.insert( NODEITEM( "Billboard", WRL2NODES::WRL2_BILLBOARD ) ); - nodenames.insert( NODEITEM( "Box", WRL2NODES::WRL2_BOX ) ); - nodenames.insert( NODEITEM( "Collision", WRL2NODES::WRL2_COLLISION ) ); - nodenames.insert( NODEITEM( "Color", WRL2NODES::WRL2_COLOR ) ); - nodenames.insert( NODEITEM( "ColorInterpolator", WRL2NODES::WRL2_COLORINTERPOLATOR ) ); - nodenames.insert( NODEITEM( "Cone", WRL2NODES::WRL2_CONE ) ); - nodenames.insert( NODEITEM( "Coordinate", WRL2NODES::WRL2_COORDINATE ) ); - nodenames.insert( NODEITEM( "CoordinateInterpolator", + nodenames.emplace( NODEITEM( "Anchor", WRL2NODES::WRL2_ANCHOR ) ); + nodenames.emplace( NODEITEM( "Appearance", WRL2NODES::WRL2_APPEARANCE ) ); + nodenames.emplace( NODEITEM( "Audioclip", WRL2NODES::WRL2_AUDIOCLIP ) ); + nodenames.emplace( NODEITEM( "Background", WRL2NODES::WRL2_BACKGROUND ) ); + nodenames.emplace( NODEITEM( "Billboard", WRL2NODES::WRL2_BILLBOARD ) ); + nodenames.emplace( NODEITEM( "Box", WRL2NODES::WRL2_BOX ) ); + nodenames.emplace( NODEITEM( "Collision", WRL2NODES::WRL2_COLLISION ) ); + nodenames.emplace( NODEITEM( "Color", WRL2NODES::WRL2_COLOR ) ); + nodenames.emplace( NODEITEM( "ColorInterpolator", WRL2NODES::WRL2_COLORINTERPOLATOR ) ); + nodenames.emplace( NODEITEM( "Cone", WRL2NODES::WRL2_CONE ) ); + nodenames.emplace( NODEITEM( "Coordinate", WRL2NODES::WRL2_COORDINATE ) ); + nodenames.emplace( NODEITEM( "CoordinateInterpolator", WRL2NODES::WRL2_COORDINATEINTERPOLATOR ) ); - nodenames.insert( NODEITEM( "Cylinder", WRL2NODES::WRL2_CYLINDER ) ); - nodenames.insert( NODEITEM( "CylinderSensor", WRL2NODES::WRL2_CYLINDERSENSOR ) ); - nodenames.insert( NODEITEM( "DirectionalLight", WRL2NODES::WRL2_DIRECTIONALLIGHT ) ); - nodenames.insert( NODEITEM( "ElevationGrid", WRL2NODES::WRL2_ELEVATIONGRID ) ); - nodenames.insert( NODEITEM( "Extrusion", WRL2NODES::WRL2_EXTRUSION ) ); - nodenames.insert( NODEITEM( "Fog", WRL2NODES::WRL2_FOG ) ); - nodenames.insert( NODEITEM( "FontStyle", WRL2NODES::WRL2_FONTSTYLE ) ); - nodenames.insert( NODEITEM( "Group", WRL2NODES::WRL2_GROUP ) ); - nodenames.insert( NODEITEM( "ImageTexture", WRL2NODES::WRL2_IMAGETEXTURE ) ); - nodenames.insert( NODEITEM( "IndexedFaceSet", WRL2NODES::WRL2_INDEXEDFACESET ) ); - nodenames.insert( NODEITEM( "IndexedLineSet", WRL2NODES::WRL2_INDEXEDLINESET ) ); - nodenames.insert( NODEITEM( "Inline", WRL2NODES::WRL2_INLINE ) ); - nodenames.insert( NODEITEM( "LOD", WRL2NODES::WRL2_LOD ) ); - nodenames.insert( NODEITEM( "Material", WRL2NODES::WRL2_MATERIAL ) ); - nodenames.insert( NODEITEM( "MovieTexture", WRL2NODES::WRL2_MOVIETEXTURE ) ); - nodenames.insert( NODEITEM( "NavigationInfo", WRL2NODES::WRL2_NAVIGATIONINFO ) ); - nodenames.insert( NODEITEM( "Normal", WRL2NODES::WRL2_NORMAL ) ); - nodenames.insert( NODEITEM( "NormalInterpolator", WRL2NODES::WRL2_NORMALINTERPOLATOR ) ); - nodenames.insert( NODEITEM( "OrientationInterpolator", + nodenames.emplace( NODEITEM( "Cylinder", WRL2NODES::WRL2_CYLINDER ) ); + nodenames.emplace( NODEITEM( "CylinderSensor", WRL2NODES::WRL2_CYLINDERSENSOR ) ); + nodenames.emplace( NODEITEM( "DirectionalLight", WRL2NODES::WRL2_DIRECTIONALLIGHT ) ); + nodenames.emplace( NODEITEM( "ElevationGrid", WRL2NODES::WRL2_ELEVATIONGRID ) ); + nodenames.emplace( NODEITEM( "Extrusion", WRL2NODES::WRL2_EXTRUSION ) ); + nodenames.emplace( NODEITEM( "Fog", WRL2NODES::WRL2_FOG ) ); + nodenames.emplace( NODEITEM( "FontStyle", WRL2NODES::WRL2_FONTSTYLE ) ); + nodenames.emplace( NODEITEM( "Group", WRL2NODES::WRL2_GROUP ) ); + nodenames.emplace( NODEITEM( "ImageTexture", WRL2NODES::WRL2_IMAGETEXTURE ) ); + nodenames.emplace( NODEITEM( "IndexedFaceSet", WRL2NODES::WRL2_INDEXEDFACESET ) ); + nodenames.emplace( NODEITEM( "IndexedLineSet", WRL2NODES::WRL2_INDEXEDLINESET ) ); + nodenames.emplace( NODEITEM( "Inline", WRL2NODES::WRL2_INLINE ) ); + nodenames.emplace( NODEITEM( "LOD", WRL2NODES::WRL2_LOD ) ); + nodenames.emplace( NODEITEM( "Material", WRL2NODES::WRL2_MATERIAL ) ); + nodenames.emplace( NODEITEM( "MovieTexture", WRL2NODES::WRL2_MOVIETEXTURE ) ); + nodenames.emplace( NODEITEM( "NavigationInfo", WRL2NODES::WRL2_NAVIGATIONINFO ) ); + nodenames.emplace( NODEITEM( "Normal", WRL2NODES::WRL2_NORMAL ) ); + nodenames.emplace( NODEITEM( "NormalInterpolator", WRL2NODES::WRL2_NORMALINTERPOLATOR ) ); + nodenames.emplace( NODEITEM( "OrientationInterpolator", WRL2NODES::WRL2_ORIENTATIONINTERPOLATOR ) ); - nodenames.insert( NODEITEM( "PixelTexture", WRL2NODES::WRL2_PIXELTEXTURE ) ); - nodenames.insert( NODEITEM( "PlaneSensor", WRL2NODES::WRL2_PLANESENSOR ) ); - nodenames.insert( NODEITEM( "PointLight", WRL2NODES::WRL2_POINTLIGHT ) ); - nodenames.insert( NODEITEM( "PointSet", WRL2NODES::WRL2_POINTSET ) ); - nodenames.insert( NODEITEM( "PositionInterpolator", + nodenames.emplace( NODEITEM( "PixelTexture", WRL2NODES::WRL2_PIXELTEXTURE ) ); + nodenames.emplace( NODEITEM( "PlaneSensor", WRL2NODES::WRL2_PLANESENSOR ) ); + nodenames.emplace( NODEITEM( "PointLight", WRL2NODES::WRL2_POINTLIGHT ) ); + nodenames.emplace( NODEITEM( "PointSet", WRL2NODES::WRL2_POINTSET ) ); + nodenames.emplace( NODEITEM( "PositionInterpolator", WRL2NODES::WRL2_POSITIONINTERPOLATOR ) ); - nodenames.insert( NODEITEM( "ProximitySensor", WRL2NODES::WRL2_PROXIMITYSENSOR ) ); - nodenames.insert( NODEITEM( "ScalarInterpolator", WRL2NODES::WRL2_SCALARINTERPOLATOR ) ); - nodenames.insert( NODEITEM( "Script", WRL2NODES::WRL2_SCRIPT ) ); - nodenames.insert( NODEITEM( "Shape", WRL2NODES::WRL2_SHAPE ) ); - nodenames.insert( NODEITEM( "Sound", WRL2NODES::WRL2_SOUND ) ); - nodenames.insert( NODEITEM( "Sphere", WRL2NODES::WRL2_SPHERE ) ); - nodenames.insert( NODEITEM( "SphereSensor", WRL2NODES::WRL2_SPHERESENSOR ) ); - nodenames.insert( NODEITEM( "SpotLight", WRL2NODES::WRL2_SPOTLIGHT ) ); - nodenames.insert( NODEITEM( "Switch", WRL2NODES::WRL2_SWITCH ) ); - nodenames.insert( NODEITEM( "Text", WRL2NODES::WRL2_TEXT ) ); - nodenames.insert( NODEITEM( "TextureCoordinate", WRL2NODES::WRL2_TEXTURECOORDINATE ) ); - nodenames.insert( NODEITEM( "TextureTransform", WRL2NODES::WRL2_TEXTURETRANSFORM ) ); - nodenames.insert( NODEITEM( "TimeSensor", WRL2NODES::WRL2_TIMESENSOR ) ); - nodenames.insert( NODEITEM( "TouchSensor", WRL2NODES::WRL2_TOUCHSENSOR ) ); - nodenames.insert( NODEITEM( "Transform", WRL2NODES::WRL2_TRANSFORM ) ); - nodenames.insert( NODEITEM( "ViewPoint", WRL2NODES::WRL2_VIEWPOINT ) ); - nodenames.insert( NODEITEM( "VisibilitySensor", WRL2NODES::WRL2_VISIBILITYSENSOR ) ); - nodenames.insert( NODEITEM( "WorldInfo", WRL2NODES::WRL2_WORLDINFO ) ); + nodenames.emplace( NODEITEM( "ProximitySensor", WRL2NODES::WRL2_PROXIMITYSENSOR ) ); + nodenames.emplace( NODEITEM( "ScalarInterpolator", WRL2NODES::WRL2_SCALARINTERPOLATOR ) ); + nodenames.emplace( NODEITEM( "Script", WRL2NODES::WRL2_SCRIPT ) ); + nodenames.emplace( NODEITEM( "Shape", WRL2NODES::WRL2_SHAPE ) ); + nodenames.emplace( NODEITEM( "Sound", WRL2NODES::WRL2_SOUND ) ); + nodenames.emplace( NODEITEM( "Sphere", WRL2NODES::WRL2_SPHERE ) ); + nodenames.emplace( NODEITEM( "SphereSensor", WRL2NODES::WRL2_SPHERESENSOR ) ); + nodenames.emplace( NODEITEM( "SpotLight", WRL2NODES::WRL2_SPOTLIGHT ) ); + nodenames.emplace( NODEITEM( "Switch", WRL2NODES::WRL2_SWITCH ) ); + nodenames.emplace( NODEITEM( "Text", WRL2NODES::WRL2_TEXT ) ); + nodenames.emplace( NODEITEM( "TextureCoordinate", WRL2NODES::WRL2_TEXTURECOORDINATE ) ); + nodenames.emplace( NODEITEM( "TextureTransform", WRL2NODES::WRL2_TEXTURETRANSFORM ) ); + nodenames.emplace( NODEITEM( "TimeSensor", WRL2NODES::WRL2_TIMESENSOR ) ); + nodenames.emplace( NODEITEM( "TouchSensor", WRL2NODES::WRL2_TOUCHSENSOR ) ); + nodenames.emplace( NODEITEM( "Transform", WRL2NODES::WRL2_TRANSFORM ) ); + nodenames.emplace( NODEITEM( "ViewPoint", WRL2NODES::WRL2_VIEWPOINT ) ); + nodenames.emplace( NODEITEM( "VisibilitySensor", WRL2NODES::WRL2_VISIBILITYSENSOR ) ); + nodenames.emplace( NODEITEM( "WorldInfo", WRL2NODES::WRL2_WORLDINFO ) ); } }