Commit patch for x3d file reader (with minor changes). Commit other minor patches and fixes (5874ac0f) · Commits · Elphel / kicad-source-mirror

3d-viewer/3d_read_mesh.cpp

+27 −503

Original line number	Diff line number	Diff line
		@@ -35,20 +35,33 @@

		#include <3d_viewer.h>
		#include <info3d_visu.h>
		#include "3d_struct.h"
		#include "modelparsers.h"

		// Imported function:
		extern void Set_Object_Data( std::vector< S3D_VERTEX >& aVertices, double aBiuTo3DUnits );

		// separator chars
		static const char* sep_chars = " \t\n\r";
		S3D_MODEL_PARSER* S3D_MODEL_PARSER::Create( S3D_MASTER* aMaster,
		const wxString aExtension )
		{
		if ( aExtension == wxT( "x3d" ) )
		{
		return new X3D_MODEL_PARSER(aMaster);
		}
		else if ( aExtension == wxT( "wrl" ) )
		{
		return new VRML_MODEL_PARSER(aMaster);
		}
		else
		{
		return NULL;
		}
		}

		int S3D_MASTER::ReadData()
		{
		char line[1024], * text;
		wxFileName fn;
		wxString FullFilename;
		FILE* file;
		int LineNum = 0;

		if( m_Shape3DName.IsEmpty() )
		{
		@@ -65,6 +78,7 @@ int S3D_MASTER::ReadData()
		if( wxFileName::FileExists( shape3DNname ) )
		{
		FullFilename = shape3DNname;
		fn.Assign(FullFilename);
		}
		else
		{
		@@ -79,512 +93,22 @@ int S3D_MASTER::ReadData()
		}
		}

		file = wxFopen( FullFilename, wxT( "rt" ) );

		if( file == NULL )
		{
		return -1;
		}

		// Switch the locale to standard C (needed to print floating point numbers like 1.3)
		SetLocaleTo_C_standard();

		while( GetLine( file, line, &LineNum, 512 ) )
		{
		text = strtok( line, sep_chars );

		if( stricmp( text, "DEF" ) == 0 \|\| stricmp( text, "Group" ) == 0)
		{
		while( GetLine( file, line, &LineNum, 512 ) )
		{
		text = strtok( line, sep_chars );

		if( text == NULL )
		continue;

		if( *text == '}' )
		break;

		if( stricmp( text, "children" ) == 0 )
		{
		ReadChildren( file, &LineNum );
		}
		}
		}
		}

		fclose( file );
		SetLocaleTo_Default(); // revert to the current locale
		return 0;
		}


		int S3D_MASTER::ReadMaterial( FILE* file, int* LineNum )
		{
		char line[512], * text, * command;
		wxString mat_name;
		S3D_MATERIAL* material = NULL;

		command = strtok( NULL, sep_chars );
		text = strtok( NULL, sep_chars );
		mat_name = FROM_UTF8( text );

		if( stricmp( command, "USE" ) == 0 )
		{
		for( material = m_Materials; material; material = material->Next() )
		{
		if( material->m_Name == mat_name )
		{
		material->SetMaterial();
		return 1;
		}
		}

		D( printf( "ReadMaterial error: material not found\n" ) );
		return 0;
		}

		if( stricmp( command, "DEF" ) == 0 \|\| stricmp( command, "Material") == 0)
		{
		material = new S3D_MATERIAL( this, mat_name );

		Insert( material );

		while( GetLine( file, line, LineNum, 512 ) )
		{
		text = strtok( line, sep_chars );

		if( text == NULL )
		continue;

		if( text[0] == '}' )
		wxString extension = fn.GetExt();
		S3D_MODEL_PARSER* parser = S3D_MODEL_PARSER::Create(this, extension);
		if(parser)
		{
		material->SetMaterial();
		parser->Load(FullFilename);
		delete parser;
		return 0;
		}

		if( stricmp( text, "diffuseColor" ) == 0 )
		{
		text = strtok( NULL, sep_chars );
		material->m_DiffuseColor.x = atof( text );
		text = strtok( NULL, sep_chars );
		material->m_DiffuseColor.y = atof( text );
		text = strtok( NULL, sep_chars );
		material->m_DiffuseColor.z = atof( text );
		}
		else if( stricmp( text, "emissiveColor" ) == 0 )
		{
		text = strtok( NULL, sep_chars );
		material->m_EmissiveColor.x = atof( text );
		text = strtok( NULL, sep_chars );
		material->m_EmissiveColor.y = atof( text );
		text = strtok( NULL, sep_chars );
		material->m_EmissiveColor.z = atof( text );
		}
		else if( strnicmp( text, "specularColor", 13 ) == 0 )
		{
		text = strtok( NULL, sep_chars );
		material->m_SpecularColor.x = atof( text );
		text = strtok( NULL, sep_chars );
		material->m_SpecularColor.y = atof( text );
		text = strtok( NULL, sep_chars );
		material->m_SpecularColor.z = atof( text );
		}
		else if( strnicmp( text, "ambientIntensity", 16 ) == 0 )
		{
		text = strtok( NULL, sep_chars );
		material->m_AmbientIntensity = atof( text );
		}
		else if( strnicmp( text, "transparency", 12 ) == 0 )
		{
		text = strtok( NULL, sep_chars );
		material->m_Transparency = atof( text );
		}
		else if( strnicmp( text, "shininess", 9 ) == 0 )
		{
		text = strtok( NULL, sep_chars );
		material->m_Shininess = atof( text );
		}
		}
		}

		return -1;
		}


		int S3D_MASTER::ReadChildren( FILE* file, int* LineNum )
		{
		char line[1024], * text;

		while( GetLine( file, line, LineNum, 512 ) )
		{
		text = strtok( line, sep_chars );

		if( *text == ']' )
		return 0;

		if( *text == ',' )
		continue;

		if( stricmp( text, "Shape" ) == 0 )
		{
		ReadShape( file, LineNum );
		}
		else
		{
		D( printf( "ReadChildren error line %d <%s> \n", *LineNum, text ) );
		break;
		}
		}

		return 1;
		}


		int S3D_MASTER::ReadShape( FILE* file, int* LineNum )
		{
		char line[1024], * text;
		int err = 1;

		while( GetLine( file, line, LineNum, 512 ) )
		{
		text = strtok( line, sep_chars );

		if( *text == '}' )
		{
		err = 0;
		break;
		wxLogDebug( wxT( "Unknown file type <%s>" ), GetChars( extension ) );
		}

		if( stricmp( text, "appearance" ) == 0 )
		{
		ReadAppearance( file, LineNum );
		}
		else if( stricmp( text, "geometry" ) == 0 )
		{
		ReadGeometry( file, LineNum );
		}
		else
		{
		D( printf( "ReadShape error line %d <%s> \n", *LineNum, text ) );
		break;
		}
		}

		return err;
		}


		int S3D_MASTER::ReadAppearance( FILE* file, int* LineNum )
		{
		char line[1024], * text;
		int err = 1;

		while( GetLine( file, line, LineNum, 512 ) )
		{
		text = strtok( line, sep_chars );

		if( *text == '}' )
		{
		err = 0; break;
		}

		if( stricmp( text, "material" ) == 0 )
		{
		ReadMaterial( file, LineNum );
		}
		else
		{
		D( printf( "ReadAppearance error line %d <%s> \n", *LineNum, text ) );
		break;
		}
		}

		return err;
		}


		#define BUFSIZE 2000

		/**
		* Function ReadCoordList
		* reads 3D coordinate lists like:
		* coord Coordinate { point [
		* -5.24489 6.57640e-3 -9.42129e-2,
		* -5.11821 6.57421e-3 0.542654,
		* -3.45868 0.256565 1.32000 ] }
		* or:
		* normal Normal { vector [
		* 0.995171 -6.08102e-6 9.81541e-2,
		* 0.923880 -4.09802e-6 0.382683,
		* 0.707107 -9.38186e-7 0.707107]
		* }
		*
		* text_buffer contains the first line of this node :
		* "coord Coordinate { point ["
		*/
		void ReadCoordsList( FILE* file, char* text_buffer, std::vector< double >& aList, int* LineNum )
		{
		unsigned int ii = 0, jj = 0;
		char* text;
		bool HasData = false;
		bool StartData = false;
		bool EndNode = false;
		char string_num[512];

		text = text_buffer;

		while( !EndNode )
		{
		if( *text == 0 ) // Needs data !
		{
		text = text_buffer;
		GetLine( file, text_buffer, LineNum, 512 );
		}

		while( !EndNode && *text )
		{
		switch( *text )
		{
		case '[':
		StartData = true;
		jj = 0;
		string_num[jj] = 0;
		break;

		case '}':
		EndNode = true;
		break;

		case ']':
		case '\t':
		case ' ':
		case ',':
		jj = 0;

		if( !StartData \|\| !HasData )
		break;

		aList.push_back( atof( string_num ) );
		string_num[jj] = 0;
		ii++;

		HasData = false;

		if( *text == ']' )
		{
		StartData = false;
		}

		break;

		default:
		if( !StartData )
		break;

		if( jj >= sizeof( string_num ) )
		break;

		string_num[jj] = *text;
		jj++;
		string_num[jj] = 0;
		HasData = true;
		break;
		}

		text++;
		}
		}
		}


		int S3D_MASTER::ReadGeometry( FILE* file, int* LineNum )
		{
		char line[1024], buffer[1024], * text;
		int err = 1;
		std::vector< double > points;
		std::vector< double > list;
		double vrmlunits_to_3Dunits = g_Parm_3D_Visu.m_BiuTo3Dunits * UNITS3D_TO_UNITSPCB;

		while( GetLine( file, line, LineNum, 512 ) )
		{
		strcpy( buffer, line );
		text = strtok( buffer, sep_chars );

		if( *text == '}' )
		{
		err = 0;
		break;
		}

		if( stricmp( text, "normalPerVertex" ) == 0 )
		{
		text = strtok( NULL, " ,\t\n\r" );

		if( stricmp( text, "true" ) == 0 )
		{
		}
		else
		{
		}
		continue;
		}

		if( stricmp( text, "colorPerVertex" ) == 0 )
		{
		text = strtok( NULL, " ,\t\n\r" );

		if( stricmp( text, "true" ) == 0 )
		{
		}
		else
		{
		}
		continue;
		}

		if( stricmp( text, "normal" ) == 0 )
		{
		ReadCoordsList( file, line, list, LineNum );
		list.clear();
		continue;
		}

		if( stricmp( text, "normalIndex" ) == 0 )
		{
		while( GetLine( file, line, LineNum, 512 ) )
		{
		text = strtok( line, " ,\t\n\r" );

		while( text )
		{
		if( *text == ']' )
		break;

		text = strtok( NULL, " ,\t\n\r" );
		}

		if( text && (*text == ']') )
		break;
		}

		continue;
		}

		if( stricmp( text, "color" ) == 0 )
		{
		ReadCoordsList( file, line, list, LineNum );
		list.clear();
		continue;
		}

		if( stricmp( text, "solid" ) == 0 )
		{
		// ignore solid
		continue;
		}

		if( stricmp( text, "colorIndex" ) == 0 )
		{
		while( GetLine( file, line, LineNum, 512 ) )
		{
		text = strtok( line, " ,\t\n\r" );

		while( text )
		{
		if( *text == ']' )
		break;

		text = strtok( NULL, " ,\t\n\r" );
		}

		if( text && (*text == ']') )
		break;
		}

		continue;
		}

		if( stricmp( text, "coord" ) == 0 )
		{
		ReadCoordsList( file, line, points, LineNum );
		}
		else if( stricmp( text, "coordIndex" ) == 0 )
		{
		if( points.size() < 3 \|\| points.size() % 3 != 0 )
		{
		wxLogError( wxT( "3D geometry read error <%s> at line %d." ),
		GetChars( FROM_UTF8( text ) ), *LineNum );
		err = 1;
		break;
		}

		std::vector< int > coordIndex;
		std::vector< S3D_VERTEX > vertices;

		while( GetLine( file, line, LineNum, 512 ) )
		{
		int jj;
		text = strtok( line, " ,\t\n\r" );

		while( text )
		{
		if( *text == ']' )
		break;

		jj = atoi( text );

		if( jj < 0 )
		{
		for( jj = 0; jj < (int) coordIndex.size(); jj++ )
		{
		int kk = coordIndex[jj] * 3;

		if( (kk < 0) \|\| ((kk + 3) > (int)points.size()) )
		{
		wxLogError( wxT( "3D geometry index read error <%s> at line %d." ),
		GetChars( FROM_UTF8( text ) ), *LineNum );
		err = 1;
		break;
		}

		S3D_VERTEX vertex;
		vertex.x = points[kk];
		vertex.y = points[kk + 1];
		vertex.z = points[kk + 2];
		vertices.push_back( vertex );
		}

		Set_Object_Coords( vertices );
		Set_Object_Data( vertices, vrmlunits_to_3Dunits );
		vertices.clear();
		coordIndex.clear();
		}
		else
		{
		coordIndex.push_back( jj );
		}

		text = strtok( NULL, " ,\t\n\r" );
		}

		if( text && (*text == ']') )
		break;
		}
		}
		else
		{
		wxLogError( wxT( "3D geometry read error <%s> at line %d." ),
		GetChars( FROM_UTF8( text ) ), *LineNum );
		err = 1;
		break;
		}
		}

		return err;
		return -1;
		}


		int STRUCT_3D_SHAPE::ReadData( FILE* file, int* LineNum )
		{
		char line[512];

3d-viewer/3d_struct.h

+0 −20

Original line number	Diff line number	Diff line
		@@ -115,26 +115,6 @@ public:

		void Copy( S3D_MASTER* pattern );
		int ReadData();

		/**
		* Function ReadMaterial
		* read the description of a 3D material definition in the form:
		* DEF yellow material Material (
		* DiffuseColor 1.00000 1.00000 0.00000e 0
		* EmissiveColor 0.00000e 0 0.00000e 0 0.00000e 0
		* SpecularColor 1.00000 1.00000 1.00000
		* AmbientIntensity 1.00000
		* Transparency 0.00000e 0
		* Shininess 1.00000
		*)
		* Or type:
		* USE yellow material
		*/
		int ReadMaterial( FILE* file, int* LineNum );
		int ReadChildren( FILE* file, int* LineNum );
		int ReadShape( FILE* file, int* LineNum );
		int ReadAppearance( FILE* file, int* LineNum );
		int ReadGeometry( FILE* file, int* LineNum );
		void Set_Object_Coords( std::vector< S3D_VERTEX >& aVertices );

		#if defined(DEBUG)

3d-viewer/CMakeLists.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,8 @@ set(3D-VIEWER_SRCS
		3d_toolbar.cpp
		info3d_visu.cpp
		trackball.cpp
		x3dmodelparser.cpp
		vrmlmodelparser.cpp
		)

		add_library(3d-viewer STATIC ${3D-VIEWER_SRCS})

3d-viewer/modelparsers.h

0 → 100644

+176 −0

Original line number	Diff line number	Diff line
		/*
		* This program source code file is part of KiCad, a free EDA CAD application.
		*
		* Copyright (C) 2013 Tuomas Vaherkoski <tuomasvaherkoski@gmail.com>
		* Copyright (C) 1992-2013 KiCad Developers, see AUTHORS.txt for contributors.
		*
		* This program is free software; you can redistribute it and/or
		* modify it under the terms of the GNU General Public License
		* as published by the Free Software Foundation; either version 2
		* of the License, or (at your option) any later version.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program; if not, you may find one here:
		* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
		* or you may search the http://www.gnu.org website for the version 2 license,
		* or you may write to the Free Software Foundation, Inc.,
		* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
		*/

		/**
		* @file modelparsers.h
		*/

		#ifndef MODELPARSERS_H
		#define MODELPARSERS_H

		#include <map>
		#include <vector>
		#include <wx/string.h>


		class S3D_MASTER;
		class S3D_VERTEX;

		extern void Set_Object_Data( std::vector< S3D_VERTEX >& aVertices, double aBiuTo3DUnits );

		class S3D_MODEL_PARSER;
		class X3D_MODEL_PARSER;

		/**
		* abstract class S3D_MODEL_PARSER
		* Base class for 3D model parsers.
		*/
		class S3D_MODEL_PARSER
		{
		public:
		S3D_MODEL_PARSER(S3D_MASTER* aMaster)
		:master(aMaster)
		{}

		virtual ~S3D_MODEL_PARSER()
		{}

		S3D_MASTER* GetMaster()
		{
		return master;
		}

		/**
		* Function Create
		* Factory method for creating concrete 3D model parsers
		* Notice that the caller is responible to delete created parser.
		*
		* @param aMaster is master object that the parser will fill.
		* @param aExtension is file extension of the file you are going to parse.
		*/
		static S3D_MODEL_PARSER* Create( S3D_MASTER* aMaster,
		const wxString aExtension );
		/**
		* Function Load
		*
		* Concrete parsers should implement this function
		*/
		virtual void Load(const wxString aFilename) = 0;

		private:
		S3D_MASTER* master;
		};


		class wxXmlNode;

		/**
		* class X3D_MODEL_PARSER
		* Implements parser for X3D file format (VRML2.0 successor)
		* X3D files can be exported from eg. Blender */
		class X3D_MODEL_PARSER: public S3D_MODEL_PARSER
		{
		public:
		X3D_MODEL_PARSER(S3D_MASTER* aMaster);
		~X3D_MODEL_PARSER();
		void Load(const wxString aFilename);

		typedef std::map< wxString, wxString > PROPERTY_MAP;
		typedef std::vector< wxXmlNode* > NODE_LIST;

		/**
		* Function GetChildsByName
		* Searches all child nodes with aName.
		*
		* @param aParent is node to search from
		* @param aName is the name of node you try to find
		* @param aResult contains found nodes
		*/
		static void GetChildsByName(wxXmlNode* aParent, const wxString aName,
		NODE_LIST& aResult);

		/**
		* Function GetNodeProperties
		* Collects all node properties to map.
		*
		* @param aProps contains map of found properties
		*/
		static void GetNodeProperties(wxXmlNode* aNode, PROPERTY_MAP& aProps);

		/**
		* Return string representing x3d file in vrml format
		* Function Load must be called before this function, otherwise empty
		* data set is returned.
		*/
		wxString VRML_representation();

		private:
		std::vector<wxString> vrml_materials;
		std::vector<wxString> vrml_points;
		std::vector<wxString> vrml_coord_indexes;

		void readTransform( wxXmlNode* aTransformNode );
		void readMaterial( wxXmlNode* aMatNode );
		void readIndexedFaceSet( wxXmlNode* aFaceNode,
		PROPERTY_MAP& aTransfromProps );
		bool parseDoubleTriplet( const wxString& aData, S3D_VERTEX& aResult );

		void rotate( S3D_VERTEX& aCoordinate, S3D_VERTEX& aRotAxis, double angle);
		};

		/**
		* class WRL_MODEL_PARSER
		* Parses
		*/
		class VRML_MODEL_PARSER: public S3D_MODEL_PARSER
		{
		public:
		VRML_MODEL_PARSER(S3D_MASTER* aMaster);
		~VRML_MODEL_PARSER();
		void Load(const wxString aFilename);

		private:
		/**
		* Function ReadMaterial
		* read the description of a 3D material definition in the form:
		* DEF yellow material Material (
		* DiffuseColor 1.00000 1.00000 0.00000e 0
		* EmissiveColor 0.00000e 0 0.00000e 0 0.00000e 0
		* SpecularColor 1.00000 1.00000 1.00000
		* AmbientIntensity 1.00000
		* Transparency 0.00000e 0
		* Shininess 1.00000
		*)
		* Or type:
		* USE yellow material
		*/
		int readMaterial( FILE* file, int* LineNum );
		int readChildren( FILE* file, int* LineNum );
		int readShape( FILE* file, int* LineNum );
		int readAppearance( FILE* file, int* LineNum );
		int readGeometry( FILE* file, int* LineNum );
		void readCoordsList( FILE* file, char* text_buffer, std::vector< double >& aList, int* LineNum );
		};

		#endif // MODELPARSERS_H

3d-viewer/vrmlmodelparser.cpp

0 → 100644

+557 −0

File added.

Preview size limit exceeded, changes collapsed.

Admin message