haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed mistaken cut/paste use of VRML2 where it should be VRML1

This commit is contained in:
Cirilo Bernardo 2016-01-05 19:35:15 +11:00
parent 42f83bdf8a
commit b126c1b697
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,7 +50,7 @@ WRL1COORDS::WRL1COORDS( NAMEREGISTER* aDictionary, WRL1NODE* aParent ) :
WRL1COORDS::~WRL1COORDS() WRL1COORDS::~WRL1COORDS()
{ {
#if defined( DEBUG_VRML2 ) && ( DEBUG_VRML2 > 2 ) #if defined( DEBUG_VRML1 ) && ( DEBUG_VRML1 > 2 )
std::cerr << " * [INFO] Destroying Coordinate3 node\n"; std::cerr << " * [INFO] Destroying Coordinate3 node\n";
#endif #endif
return; return;
@ -61,7 +61,7 @@ bool WRL1COORDS::AddRefNode( WRL1NODE* aNode )
{ {
// this node may not own or reference any other node // this node may not own or reference any other node
#ifdef DEBUG_VRML2 #ifdef DEBUG_VRML1
std::cerr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; std::cerr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
std::cerr << " * [BUG] AddRefNode is not applicable\n"; std::cerr << " * [BUG] AddRefNode is not applicable\n";
#endif #endif
@ -74,7 +74,7 @@ bool WRL1COORDS::AddChildNode( WRL1NODE* aNode )
{ {
// this node may not own or reference any other node // this node may not own or reference any other node
#ifdef DEBUG_VRML2 #ifdef DEBUG_VRML1
std::cerr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; std::cerr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
std::cerr << " * [BUG] AddChildNode is not applicable\n"; std::cerr << " * [BUG] AddChildNode is not applicable\n";
#endif #endif
@ -92,7 +92,7 @@ bool WRL1COORDS::Read( WRLPROC& proc, WRL1BASE* aTopNode )
if( proc.eof() ) if( proc.eof() )
{ {
#if defined( DEBUG_VRML2 ) && ( DEBUG_VRML2 > 1 ) #if defined( DEBUG_VRML1 ) && ( DEBUG_VRML1 > 1 )
std::cerr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; std::cerr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
std::cerr << " * [INFO] bad file format; unexpected eof at line "; std::cerr << " * [INFO] bad file format; unexpected eof at line ";
std::cerr << line << ", column " << column << "\n"; std::cerr << line << ", column " << column << "\n";
@ -102,7 +102,7 @@ bool WRL1COORDS::Read( WRLPROC& proc, WRL1BASE* aTopNode )
if( '{' != tok ) if( '{' != tok )
{ {
#if defined( DEBUG_VRML2 ) && ( DEBUG_VRML2 > 1 ) #if defined( DEBUG_VRML1 ) && ( DEBUG_VRML1 > 1 )
std::cerr << proc.GetError() << "\n"; std::cerr << proc.GetError() << "\n";
std::cerr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; std::cerr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
std::cerr << " * [INFO] bad file format; expecting '{' but got '" << tok; std::cerr << " * [INFO] bad file format; expecting '{' but got '" << tok;
@ -123,7 +123,7 @@ bool WRL1COORDS::Read( WRLPROC& proc, WRL1BASE* aTopNode )
if( !proc.ReadName( glob ) ) if( !proc.ReadName( glob ) )
{ {
#if defined( DEBUG_VRML2 ) && ( DEBUG_VRML2 > 1 ) #if defined( DEBUG_VRML1 ) && ( DEBUG_VRML1 > 1 )
std::cerr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; std::cerr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
std::cerr << proc.GetError() << "\n"; std::cerr << proc.GetError() << "\n";
#endif #endif
@ -138,7 +138,7 @@ bool WRL1COORDS::Read( WRLPROC& proc, WRL1BASE* aTopNode )
{ {
if( !proc.ReadMFVec3f( points ) ) if( !proc.ReadMFVec3f( points ) )
{ {
#if defined( DEBUG_VRML2 ) && ( DEBUG_VRML2 > 1 ) #if defined( DEBUG_VRML1 ) && ( DEBUG_VRML1 > 1 )
std::cerr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; std::cerr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
std::cerr << " * [INFO] invalid point set at line " << line << ", column "; std::cerr << " * [INFO] invalid point set at line " << line << ", column ";
std::cerr << column << "\n"; std::cerr << column << "\n";
@ -150,7 +150,7 @@ bool WRL1COORDS::Read( WRLPROC& proc, WRL1BASE* aTopNode )
} }
else else
{ {
#if defined( DEBUG_VRML2 ) && ( DEBUG_VRML2 > 1 ) #if defined( DEBUG_VRML1 ) && ( DEBUG_VRML1 > 1 )
std::cerr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; std::cerr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
std::cerr << " * [INFO] bad Coordinate at line " << line << ", column "; std::cerr << " * [INFO] bad Coordinate at line " << line << ", column ";
std::cerr << column << "\n"; std::cerr << column << "\n";
@ -168,7 +168,7 @@ bool WRL1COORDS::Read( WRLPROC& proc, WRL1BASE* aTopNode )
proc.GetFilePosData( line, column ); proc.GetFilePosData( line, column );
#if defined( DEBUG_VRML2 ) && ( DEBUG_VRML2 > 1 ) #if defined( DEBUG_VRML1 ) && ( DEBUG_VRML1 > 1 )
std::cerr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; std::cerr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
std::cerr << " * [INFO] bad Coordinate at line " << line << ", column "; std::cerr << " * [INFO] bad Coordinate at line " << line << ", column ";
std::cerr << column << " (no closing brace)\n"; std::cerr << column << " (no closing brace)\n";

2
plugins/3d/vrml/v1/vrml1_node.h
View File

@ -100,7 +100,7 @@ struct WRL1STATUS
/** /**
* Class WRL1NODE * Class WRL1NODE
* represents the base class of all VRML2 nodes * represents the base class of all VRML1 nodes
*/ */
class WRL1NODE class WRL1NODE
{ {