Mirrors
/
kicad
mirror of https://github.com/KiCad/kicad-source-mirror
3
0
Fork 0
Code Releases Activity
Browse Source

Enum class WRL1NODES

6.0.7
Marek Roszko 5 years ago
parent
88179ec52d
commit
56c4c845e8
12 changed files with 77 additions and 77 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 26
      plugins/3d/vrml/v1/vrml1_base.cpp
  2. 4
      plugins/3d/vrml/v1/vrml1_coords.cpp
  3. 4
      plugins/3d/vrml/v1/vrml1_faceset.cpp
  4. 6
      plugins/3d/vrml/v1/vrml1_group.cpp
  5. 4
      plugins/3d/vrml/v1/vrml1_matbinding.cpp
  6. 4
      plugins/3d/vrml/v1/vrml1_material.cpp
  7. 86
      plugins/3d/vrml/v1/vrml1_node.cpp
  8. 4
      plugins/3d/vrml/v1/vrml1_separator.cpp
  9. 4
      plugins/3d/vrml/v1/vrml1_shapehints.cpp
  10. 4
      plugins/3d/vrml/v1/vrml1_switch.cpp
  11. 6
      plugins/3d/vrml/v1/vrml1_transform.cpp
  12. 2
      plugins/3d/vrml/wrltypes.h

26
plugins/3d/vrml/v1/vrml1_base.cpp
View File

@ -40,7 +40,7 @@
WRL1BASE::WRL1BASE() : WRL1NODE( NULL ) WRL1BASE::WRL1BASE() : WRL1NODE( NULL )
{ {
m_Type = WRL1_BASE;
m_Type = WRL1NODES::WRL1_BASE;
m_dictionary = new NAMEREGISTER; m_dictionary = new NAMEREGISTER;
return; return;
} }
@ -411,66 +411,66 @@ bool WRL1BASE::ReadNode( WRLPROC& proc, WRL1NODE* aParent, WRL1NODE** aNode )
switch( ntype ) switch( ntype )
{ {
case WRL1_GROUP:
case WRL1NODES::WRL1_GROUP:
if( !readGroup( proc, aParent, aNode ) ) if( !readGroup( proc, aParent, aNode ) )
return false; return false;
break; break;
case WRL1_SEPARATOR:
case WRL1NODES::WRL1_SEPARATOR:
if( !readSeparator( proc, aParent, aNode ) ) if( !readSeparator( proc, aParent, aNode ) )
return false; return false;
break; break;
case WRL1_SWITCH:
case WRL1NODES::WRL1_SWITCH:
if( !readSwitch( proc, aParent, aNode ) ) if( !readSwitch( proc, aParent, aNode ) )
return false; return false;
break; break;
case WRL1_MATERIAL:
case WRL1NODES::WRL1_MATERIAL:
if( !readMaterial( proc, aParent, aNode ) ) if( !readMaterial( proc, aParent, aNode ) )
return false; return false;
break; break;
case WRL1_MATERIALBINDING:
case WRL1NODES::WRL1_MATERIALBINDING:
if( !readMatBinding( proc, aParent, aNode ) ) if( !readMatBinding( proc, aParent, aNode ) )
return false; return false;
break; break;
case WRL1_COORDINATE3:
case WRL1NODES::WRL1_COORDINATE3:
if( !readCoords( proc, aParent, aNode ) ) if( !readCoords( proc, aParent, aNode ) )
return false; return false;
break; break;
case WRL1_INDEXEDFACESET:
case WRL1NODES::WRL1_INDEXEDFACESET:
if( !readFaceSet( proc, aParent, aNode ) ) if( !readFaceSet( proc, aParent, aNode ) )
return false; return false;
break; break;
case WRL1_TRANSFORM:
case WRL1_TRANSLATION:
case WRL1_ROTATION:
case WRL1_SCALE:
case WRL1NODES::WRL1_TRANSFORM:
case WRL1NODES::WRL1_TRANSLATION:
case WRL1NODES::WRL1_ROTATION:
case WRL1NODES::WRL1_SCALE:
if( !readTransform( proc, aParent, aNode ) ) if( !readTransform( proc, aParent, aNode ) )
return false; return false;
break; break;
case WRL1_SHAPEHINTS:
case WRL1NODES::WRL1_SHAPEHINTS:
if( !readShapeHints( proc, aParent, aNode ) ) if( !readShapeHints( proc, aParent, aNode ) )
return false; return false;

4
plugins/3d/vrml/v1/vrml1_coords.cpp
View File

@ -32,7 +32,7 @@
WRL1COORDS::WRL1COORDS( NAMEREGISTER* aDictionary ) : WRL1NODE( aDictionary ) WRL1COORDS::WRL1COORDS( NAMEREGISTER* aDictionary ) : WRL1NODE( aDictionary )
{ {
m_Type = WRL1_COORDINATE3;
m_Type = WRL1NODES::WRL1_COORDINATE3;
return; return;
} }
@ -40,7 +40,7 @@ WRL1COORDS::WRL1COORDS( NAMEREGISTER* aDictionary ) : WRL1NODE( aDictionary )
WRL1COORDS::WRL1COORDS( NAMEREGISTER* aDictionary, WRL1NODE* aParent ) : WRL1COORDS::WRL1COORDS( NAMEREGISTER* aDictionary, WRL1NODE* aParent ) :
WRL1NODE( aDictionary ) WRL1NODE( aDictionary )
{ {
m_Type = WRL1_COORDINATE3;
m_Type = WRL1NODES::WRL1_COORDINATE3;
m_Parent = aParent; m_Parent = aParent;
if( NULL != m_Parent ) if( NULL != m_Parent )

4
plugins/3d/vrml/v1/vrml1_faceset.cpp
View File

@ -36,7 +36,7 @@
WRL1FACESET::WRL1FACESET( NAMEREGISTER* aDictionary ) : WRL1NODE( aDictionary ) WRL1FACESET::WRL1FACESET( NAMEREGISTER* aDictionary ) : WRL1NODE( aDictionary )
{ {
m_Type = WRL1_INDEXEDFACESET;
m_Type = WRL1NODES::WRL1_INDEXEDFACESET;
return; return;
} }
@ -45,7 +45,7 @@ WRL1FACESET::WRL1FACESET( NAMEREGISTER* aDictionary ) : WRL1NODE( aDictionary )
WRL1FACESET::WRL1FACESET( NAMEREGISTER* aDictionary, WRL1NODE* aParent ) : WRL1FACESET::WRL1FACESET( NAMEREGISTER* aDictionary, WRL1NODE* aParent ) :
WRL1NODE( aDictionary ) WRL1NODE( aDictionary )
{ {
m_Type = WRL1_INDEXEDFACESET;
m_Type = WRL1NODES::WRL1_INDEXEDFACESET;
m_Parent = aParent; m_Parent = aParent;
if( NULL != m_Parent ) if( NULL != m_Parent )

6
plugins/3d/vrml/v1/vrml1_group.cpp
View File

@ -38,7 +38,7 @@
WRL1GROUP::WRL1GROUP( NAMEREGISTER* aDictionary ) : WRL1NODE( aDictionary ) WRL1GROUP::WRL1GROUP( NAMEREGISTER* aDictionary ) : WRL1NODE( aDictionary )
{ {
m_Type = WRL1_GROUP;
m_Type = WRL1NODES::WRL1_GROUP;
return; return;
} }
@ -46,7 +46,7 @@ WRL1GROUP::WRL1GROUP( NAMEREGISTER* aDictionary ) : WRL1NODE( aDictionary )
WRL1GROUP::WRL1GROUP( NAMEREGISTER* aDictionary, WRL1NODE* aParent ) : WRL1GROUP::WRL1GROUP( NAMEREGISTER* aDictionary, WRL1NODE* aParent ) :
WRL1NODE( aDictionary ) WRL1NODE( aDictionary )
{ {
m_Type = WRL1_GROUP;
m_Type = WRL1NODES::WRL1_GROUP;
m_Parent = aParent; m_Parent = aParent;
if( NULL != m_Parent ) if( NULL != m_Parent )
@ -188,7 +188,7 @@ SGNODE* WRL1GROUP::TranslateToSG( SGNODE* aParent, WRL1STATUS* sp )
return NULL; return NULL;
} }
if( WRL1_BASE != m_Parent->GetNodeType() )
if( WRL1NODES::WRL1_BASE != m_Parent->GetNodeType() )
{ {
if( NULL == sp ) if( NULL == sp )
{ {

4
plugins/3d/vrml/v1/vrml1_matbinding.cpp
View File

@ -34,7 +34,7 @@
WRL1MATBINDING::WRL1MATBINDING( NAMEREGISTER* aDictionary ) : WRL1NODE( aDictionary ) WRL1MATBINDING::WRL1MATBINDING( NAMEREGISTER* aDictionary ) : WRL1NODE( aDictionary )
{ {
m_binding = WRL1_BINDING::BIND_OVERALL; m_binding = WRL1_BINDING::BIND_OVERALL;
m_Type = WRL1_MATERIALBINDING;
m_Type = WRL1NODES::WRL1_MATERIALBINDING;
return; return;
} }
@ -43,7 +43,7 @@ WRL1MATBINDING::WRL1MATBINDING( NAMEREGISTER* aDictionary, WRL1NODE* aParent ) :
WRL1NODE( aDictionary ) WRL1NODE( aDictionary )
{ {
m_binding = WRL1_BINDING::BIND_OVERALL; m_binding = WRL1_BINDING::BIND_OVERALL;
m_Type = WRL1_MATERIALBINDING;
m_Type = WRL1NODES::WRL1_MATERIALBINDING;
m_Parent = aParent; m_Parent = aParent;
if( NULL != m_Parent ) if( NULL != m_Parent )

4
plugins/3d/vrml/v1/vrml1_material.cpp
View File

@ -35,7 +35,7 @@ WRL1MATERIAL::WRL1MATERIAL( NAMEREGISTER* aDictionary ) : WRL1NODE( aDictionary
{ {
colors[0] = NULL; colors[0] = NULL;
colors[1] = NULL; colors[1] = NULL;
m_Type = WRL1_MATERIAL;
m_Type = WRL1NODES::WRL1_MATERIAL;
return; return;
} }
@ -45,7 +45,7 @@ WRL1MATERIAL::WRL1MATERIAL( NAMEREGISTER* aDictionary, WRL1NODE* aParent ) :
{ {
colors[0] = NULL; colors[0] = NULL;
colors[1] = NULL; colors[1] = NULL;
m_Type = WRL1_MATERIAL;
m_Type = WRL1NODES::WRL1_MATERIAL;
m_Parent = aParent; m_Parent = aParent;
if( NULL != m_Parent ) if( NULL != m_Parent )

86
plugins/3d/vrml/v1/vrml1_node.cpp
View File

@ -94,46 +94,46 @@ WRL1NODE::WRL1NODE( NAMEREGISTER* aDictionary )
{ {
m_sgNode = NULL; m_sgNode = NULL;
m_Parent = NULL; m_Parent = NULL;
m_Type = WRL1_END;
m_Type = WRL1NODES::WRL1_END;
m_dictionary = aDictionary; m_dictionary = aDictionary;
if( nodenames.empty() ) if( nodenames.empty() )
{ {
nodenames.insert( NODEITEM( "AsciiText", WRL1_ASCIITEXT ) );
nodenames.insert( NODEITEM( "Cone", WRL1_CONE ) );
nodenames.insert( NODEITEM( "Coordinate3", WRL1_COORDINATE3 ) );
nodenames.insert( NODEITEM( "Cube", WRL1_CUBE ) );
nodenames.insert( NODEITEM( "Cylinder", WRL1_CYLINDER ) );
nodenames.insert( NODEITEM( "DirectionalLight", WRL1_DIRECTIONALLIGHT ) );
nodenames.insert( NODEITEM( "FontStyle", WRL1_FONTSTYLE ) );
nodenames.insert( NODEITEM( "Group", WRL1_GROUP ) );
nodenames.insert( NODEITEM( "IndexedFaceSet", WRL1_INDEXEDFACESET ) );
nodenames.insert( NODEITEM( "IndexedLineSet", WRL1_INDEXEDLINESET ) );
nodenames.insert( NODEITEM( "Info", WRL1_INFO ) );
nodenames.insert( NODEITEM( "LOD", WRL1_LOD ) );
nodenames.insert( NODEITEM( "Material", WRL1_MATERIAL ) );
nodenames.insert( NODEITEM( "MaterialBinding", WRL1_MATERIALBINDING ) );
nodenames.insert( NODEITEM( "MatrixTransform", WRL1_MATRIXTRANSFORM ) );
nodenames.insert( NODEITEM( "Normal", WRL1_NORMAL ) );
nodenames.insert( NODEITEM( "NormalBinding", WRL1_NORMALBINDING ) );
nodenames.insert( NODEITEM( "OrthographicCamera", WRL1_ORTHOCAMERA ) );
nodenames.insert( NODEITEM( "PerspectiveCamera", WRL1_PERSPECTIVECAMERA ) );
nodenames.insert( NODEITEM( "PointLight", WRL1_POINTLIGHT ) );
nodenames.insert( NODEITEM( "PointSet", WRL1_POINTSET ) );
nodenames.insert( NODEITEM( "Rotation", WRL1_ROTATION ) );
nodenames.insert( NODEITEM( "Scale", WRL1_SCALE ) );
nodenames.insert( NODEITEM( "Separator", WRL1_SEPARATOR ) );
nodenames.insert( NODEITEM( "ShapeHints", WRL1_SHAPEHINTS ) );
nodenames.insert( NODEITEM( "Sphere", WRL1_SPHERE ) );
nodenames.insert( NODEITEM( "SpotLight", WRL1_SPOTLIGHT ) );
nodenames.insert( NODEITEM( "Switch", WRL1_SWITCH ) );
nodenames.insert( NODEITEM( "Texture2", WRL1_TEXTURE2 ) );
nodenames.insert( NODEITEM( "Testure2Transform", WRL1_TEXTURE2TRANSFORM ) );
nodenames.insert( NODEITEM( "TextureCoordinate2", WRL1_TEXTURECOORDINATE2 ) );
nodenames.insert( NODEITEM( "Transform", WRL1_TRANSFORM ) );
nodenames.insert( NODEITEM( "Translation", WRL1_TRANSLATION ) );
nodenames.insert( NODEITEM( "WWWAnchor", WRL1_WWWANCHOR ) );
nodenames.insert( NODEITEM( "WWWInline", WRL1_WWWINLINE ) );
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 ) );
} }
return; return;
@ -252,7 +252,7 @@ void WRL1NODE::cancelDict( void )
++sC; ++sC;
} }
if( m_Type == WRL1_BASE && NULL != m_dictionary )
if( m_Type == WRL1NODES::WRL1_BASE && NULL != m_dictionary )
delete m_dictionary; delete m_dictionary;
m_dictionary = NULL; m_dictionary = NULL;
@ -377,14 +377,14 @@ bool WRL1NODE::SetName( const std::string& aName )
const char* WRL1NODE::GetNodeTypeName( WRL1NODES aNodeType ) const const char* WRL1NODE::GetNodeTypeName( WRL1NODES aNodeType ) const
{ {
if( aNodeType < WRL1_BASE || aNodeType >= WRL1_END )
if( aNodeType < WRL1NODES::WRL1_BASE || aNodeType >= WRL1NODES::WRL1_END )
return "*INVALID_TYPE*"; return "*INVALID_TYPE*";
if( aNodeType == WRL1_BASE )
if( aNodeType == WRL1NODES::WRL1_BASE )
return "*VIRTUAL_BASE*"; return "*VIRTUAL_BASE*";
NODEMAP::iterator it = nodenames.begin(); NODEMAP::iterator it = nodenames.begin();
advance( it, (aNodeType - WRL1_BEGIN) );
advance( it, ( static_cast<int>( aNodeType ) - static_cast<int>( WRL1NODES::WRL1_BEGIN ) ) );
return it->first.c_str(); return it->first.c_str();
} }
@ -397,7 +397,7 @@ WRL1NODES WRL1NODE::getNodeTypeID( const std::string& aNodeName )
if( nodenames.end() != it ) if( nodenames.end() != it )
return it->second; return it->second;
return WRL1_INVALID;
return WRL1NODES::WRL1_INVALID;
} }
@ -441,7 +441,7 @@ bool WRL1NODE::SetParent( WRL1NODE* aParent, bool doUnlink )
bool WRL1NODE::AddChildNode( WRL1NODE* aNode ) bool WRL1NODE::AddChildNode( WRL1NODE* aNode )
{ {
if( aNode->GetNodeType() == WRL1_BASE )
if( aNode->GetNodeType() == WRL1NODES::WRL1_BASE )
{ {
#ifdef DEBUG_VRML1 #ifdef DEBUG_VRML1
do { do {
@ -492,7 +492,7 @@ bool WRL1NODE::AddRefNode( WRL1NODE* aNode )
return false; return false;
} }
if( aNode->GetNodeType() == WRL1_BASE )
if( aNode->GetNodeType() == WRL1NODES::WRL1_BASE )
{ {
#ifdef DEBUG_VRML1 #ifdef DEBUG_VRML1
do { do {

4
plugins/3d/vrml/v1/vrml1_separator.cpp
View File

@ -32,7 +32,7 @@
WRL1SEPARATOR::WRL1SEPARATOR( NAMEREGISTER* aDictionary ) : WRL1NODE( aDictionary ) WRL1SEPARATOR::WRL1SEPARATOR( NAMEREGISTER* aDictionary ) : WRL1NODE( aDictionary )
{ {
m_Type = WRL1_SEPARATOR;
m_Type = WRL1NODES::WRL1_SEPARATOR;
return; return;
} }
@ -40,7 +40,7 @@ WRL1SEPARATOR::WRL1SEPARATOR( NAMEREGISTER* aDictionary ) : WRL1NODE( aDictionar
WRL1SEPARATOR::WRL1SEPARATOR( NAMEREGISTER* aDictionary, WRL1NODE* aParent ) : WRL1SEPARATOR::WRL1SEPARATOR( NAMEREGISTER* aDictionary, WRL1NODE* aParent ) :
WRL1NODE( aDictionary ) WRL1NODE( aDictionary )
{ {
m_Type = WRL1_SEPARATOR;
m_Type = WRL1NODES::WRL1_SEPARATOR;
m_Parent = aParent; m_Parent = aParent;
if( NULL != m_Parent ) if( NULL != m_Parent )

4
plugins/3d/vrml/v1/vrml1_shapehints.cpp
View File

@ -35,7 +35,7 @@
WRL1SHAPEHINTS::WRL1SHAPEHINTS( NAMEREGISTER* aDictionary ) : WRL1NODE( aDictionary ) WRL1SHAPEHINTS::WRL1SHAPEHINTS( NAMEREGISTER* aDictionary ) : WRL1NODE( aDictionary )
{ {
m_order = WRL1_ORDER::ORD_UNKNOWN; m_order = WRL1_ORDER::ORD_UNKNOWN;
m_Type = WRL1_SHAPEHINTS;
m_Type = WRL1NODES::WRL1_SHAPEHINTS;
m_crease = 0.733f; // approx 42 degrees; this is larger than VRML spec. m_crease = 0.733f; // approx 42 degrees; this is larger than VRML spec.
return; return;
} }
@ -45,7 +45,7 @@ WRL1SHAPEHINTS::WRL1SHAPEHINTS( NAMEREGISTER* aDictionary, WRL1NODE* aParent ) :
WRL1NODE( aDictionary ) WRL1NODE( aDictionary )
{ {
m_order = WRL1_ORDER::ORD_UNKNOWN; m_order = WRL1_ORDER::ORD_UNKNOWN;
m_Type = WRL1_SHAPEHINTS;
m_Type = WRL1NODES::WRL1_SHAPEHINTS;
m_crease = 0.733f; // approx 42 degrees; this is larger than VRML spec. m_crease = 0.733f; // approx 42 degrees; this is larger than VRML spec.
m_Parent = aParent; m_Parent = aParent;

4
plugins/3d/vrml/v1/vrml1_switch.cpp
View File

@ -33,7 +33,7 @@
WRL1SWITCH::WRL1SWITCH( NAMEREGISTER* aDictionary ) : WRL1NODE( aDictionary ) WRL1SWITCH::WRL1SWITCH( NAMEREGISTER* aDictionary ) : WRL1NODE( aDictionary )
{ {
m_Type = WRL1_SWITCH;
m_Type = WRL1NODES::WRL1_SWITCH;
whichChild = -1; whichChild = -1;
return; return;
@ -43,7 +43,7 @@ WRL1SWITCH::WRL1SWITCH( NAMEREGISTER* aDictionary ) : WRL1NODE( aDictionary )
WRL1SWITCH::WRL1SWITCH( NAMEREGISTER* aDictionary, WRL1NODE* aParent ) : WRL1SWITCH::WRL1SWITCH( NAMEREGISTER* aDictionary, WRL1NODE* aParent ) :
WRL1NODE( aDictionary ) WRL1NODE( aDictionary )
{ {
m_Type = WRL1_SWITCH;
m_Type = WRL1NODES::WRL1_SWITCH;
m_Parent = aParent; m_Parent = aParent;
whichChild = -1; whichChild = -1;

6
plugins/3d/vrml/v1/vrml1_transform.cpp
View File

@ -32,7 +32,7 @@
WRL1TRANSFORM::WRL1TRANSFORM( NAMEREGISTER* aDictionary ) : WRL1NODE( aDictionary ) WRL1TRANSFORM::WRL1TRANSFORM( NAMEREGISTER* aDictionary ) : WRL1NODE( aDictionary )
{ {
m_Type = WRL1_TRANSFORM;
m_Type = WRL1NODES::WRL1_TRANSFORM;
return; return;
} }
@ -40,7 +40,7 @@ WRL1TRANSFORM::WRL1TRANSFORM( NAMEREGISTER* aDictionary ) : WRL1NODE( aDictionar
WRL1TRANSFORM::WRL1TRANSFORM( NAMEREGISTER* aDictionary, WRL1NODE* aParent ) : WRL1TRANSFORM::WRL1TRANSFORM( NAMEREGISTER* aDictionary, WRL1NODE* aParent ) :
WRL1NODE( aDictionary ) WRL1NODE( aDictionary )
{ {
m_Type = WRL1_TRANSFORM;
m_Type = WRL1NODES::WRL1_TRANSFORM;
m_Parent = aParent; m_Parent = aParent;
if( NULL != m_Parent ) if( NULL != m_Parent )
@ -346,7 +346,7 @@ SGNODE* WRL1TRANSFORM::TranslateToSG( SGNODE* aParent, WRL1STATUS* sp )
if( NULL == m_Parent ) if( NULL == m_Parent )
return NULL; return NULL;
if( WRL1_BASE == m_Parent->GetNodeType() )
if( WRL1NODES::WRL1_BASE == m_Parent->GetNodeType() )
return NULL; return NULL;
if( NULL == sp ) if( NULL == sp )

2
plugins/3d/vrml/wrltypes.h
View File

@ -49,7 +49,7 @@ enum class WRLVERSION
// These are used to look up node names and to quickly // These are used to look up node names and to quickly
// determine what routine to invoke to read a section of // determine what routine to invoke to read a section of
// a file. // a file.
enum WRL1NODES
enum class WRL1NODES
{ {
WRL1_BASE = 0, // not really a VRML node but we need a top level virtual node WRL1_BASE = 0, // not really a VRML node but we need a top level virtual node
WRL1_BEGIN, WRL1_BEGIN,

Write Preview
Loading…
Cancel
Save